feat(chart): allow built-in kubernetes cloud profile support

nefelim4ag · Dec 18, 2023 · 6841c23 · 6841c23
1 parent b22545e
commit 6841c23
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 1 deletion.
diff --git a/charts/teamcity-server/Chart.yaml b/charts/teamcity-server/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: teamcity-server
 description: A Helm chart for deploy HA teamcity server
 type: application
-version: 3.0.0
+version: 3.1.0
 appVersion: "2023.11"
diff --git a/charts/teamcity-server/templates/teamcity/rbac.yaml.tpl b/charts/teamcity-server/templates/teamcity/rbac.yaml.tpl
@@ -0,0 +1,30 @@
+{{- if $.Values.serviceAccount.enabled }}
+{{- if $.Values.serviceAccount.agentRBAC.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ $.Release.Name }}-agent-ctrl
+rules:
+- apiGroups: [""]
+  resources: ["namespaces"]
+  verbs: ["list", "get"]
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get", "create", "list", "delete"]
+- apiGroups: ["extensions", "apps"]
+  resources: ["deployments"]
+  verbs: ["list", "get"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ $.Release.Name }}-agent-ctrl
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ $.Release.Name }}-agent-ctrl
+subjects:
+  - kind: ServiceAccount
+    name: {{ $.Release.Name }}
+{{- end }}
+{{- end }}
diff --git a/charts/teamcity-server/templates/teamcity/serviceaccount.yaml.tpl b/charts/teamcity-server/templates/teamcity/serviceaccount.yaml.tpl
@@ -0,0 +1,7 @@
+{{- if $.Values.serviceAccount.enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $.Release.Name }}
+  annotations: {{ $.Values.serviceAccount.annotations | toJson }}
+{{- end }}
diff --git a/charts/teamcity-server/templates/teamcity/teamcity.yaml.tpl b/charts/teamcity-server/templates/teamcity/teamcity.yaml.tpl
@@ -21,6 +21,9 @@ spec:
         app: {{ $.Release.Name }}
         component: server
     spec:
+{{- if $.Values.serviceAccount.enabled }}
+      serviceAccountName: {{ $.Release.Name }}
+{{- end }}
       containers:
       - name: {{ $.Release.Name }}
         image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }}

diff --git a/charts/teamcity-server/values.yaml b/charts/teamcity-server/values.yaml
@@ -126,6 +126,12 @@ teamcity:
     - CAN_CHECK_FOR_CHANGES
     - CAN_PROCESS_BUILD_MESSAGES
 
+serviceAccount:
+  enabled: false
+  annotations: {}
+  agentRBAC:
+      enabled: false
+
 pdb:
   enabled: true
   minAvailable: 1