🌱 refactor konnectivity chart (#97)

refactor konnectivity chart Signed-off-by: kranurag7 <[email protected]>
syself · Jun 28, 2024 · 6bcbe7f · 6bcbe7f
1 parent d8e7f36
commit 6bcbe7f
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 9 deletions.
diff --git a/charts/konnectivity-agent/Chart.yaml b/charts/konnectivity-agent/Chart.yaml
@@ -14,4 +14,4 @@ dependencies:
     alias: proportional-autoscaler
     condition: proportional-autoscaler.enabled
 appVersion: v1.8.9
-version: 1.0.12
+version: 1.0.13
diff --git a/charts/konnectivity-agent/templates/_helpers.tpl b/charts/konnectivity-agent/templates/_helpers.tpl
@@ -63,7 +63,7 @@ Selector labels for server
 {{- define "konnectivity-server.selectorLabels" -}}
 app.kubernetes.io/name: konnectivity-server
 app.kubernetes.io/instance: konnectivity-server
-k8s-app: konnectivity-agent
+k8s-app: konnectivity-server
 {{- end }}
 
 {{/*
@@ -85,3 +85,14 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the service account to use for konnectivity-server
+*/}}
+{{- define "konnectivity-server.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default .Values.server.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.server.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/...nectivity-agent/templates/deployment.yaml → ...ity-agent/templates/agent/deployment.yaml b/...nectivity-agent/templates/deployment.yaml → ...ity-agent/templates/agent/deployment.yaml
@@ -85,7 +85,7 @@ spec:
             sources:
               - serviceAccountToken:
                   path: konnectivity-agent-token
-                  audience: system:konnectivity-server
+                  audience: system:konnectivity-agent
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/konnectivity-agent/templates/pdb.yaml → ...nnectivity-agent/templates/agent/pdb.yaml b/charts/konnectivity-agent/templates/pdb.yaml → ...nnectivity-agent/templates/agent/pdb.yaml
diff --git a/charts/konnectivity-agent/templates/agent/rbac.yaml b/charts/konnectivity-agent/templates/agent/rbac.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: system:konnectivity-agent
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "konnectivity-agent.labels" . | indent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+  - apiGroup: rbac.authorization.k8s.io
+    kind: User
+    name: system:konnectivity-agent
diff --git a/...konnectivity-agent/templates/service.yaml → ...tivity-agent/templates/agent/service.yaml b/...konnectivity-agent/templates/service.yaml → ...tivity-agent/templates/agent/service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "konnectivity-agent.fullname" . }}
+  name: konnectivity-agent
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "konnectivity-agent.labels" . | indent 4}}

diff --git a/...ivity-agent/templates/serviceMonitor.yaml → ...agent/templates/agent/serviceMonitor.yaml b/...ivity-agent/templates/serviceMonitor.yaml → ...agent/templates/agent/serviceMonitor.yaml
diff --git a/...ivity-agent/templates/serviceaccount.yaml → ...agent/templates/agent/serviceaccount.yaml b/...ivity-agent/templates/serviceaccount.yaml → ...agent/templates/agent/serviceaccount.yaml
diff --git a/...ts/konnectivity-agent/templates/rbac.yaml → ...ectivity-agent/templates/server/rbac.yaml b/...ts/konnectivity-agent/templates/rbac.yaml → ...ectivity-agent/templates/server/rbac.yaml
@@ -4,7 +4,7 @@ metadata:
   name: system:konnectivity-server
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "konnectivity-agent.labels" . | indent 4 }}
+{{ include "konnectivity-server.labels" . | indent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/...ivity-agent/templates/server-service.yaml → ...ivity-agent/templates/server/service.yaml b/...ivity-agent/templates/server-service.yaml → ...ivity-agent/templates/server/service.yaml
@@ -8,15 +8,15 @@ metadata:
 spec:
   clusterIP: None
   ports:
+    - name: agent-port
+      port: {{ .Values.ports.proxy }}
+      protocol: TCP
+      targetPort: {{ .Values.ports.proxy }}
     {{- if .Values.server.serviceMonitor.enabled }}
     - name: http-metrics
       port: {{ .Values.ports.admin }}
       protocol: TCP
       targetPort: {{ .Values.ports.admin }}
     {{- end }}
-    - name: agent-port
-      port: {{ .Values.ports.proxy }}
-      protocol: TCP
-      targetPort: {{ .Values.ports.proxy }}
   selector:
     {{- include "konnectivity-server.selectorLabels" . | nindent 4 }}
diff --git a/...gent/templates/server-serviceMonitor.yaml → ...gent/templates/server/serviceMonitor.yaml b/...gent/templates/server-serviceMonitor.yaml → ...gent/templates/server/serviceMonitor.yaml
diff --git a/charts/konnectivity-agent/templates/server/serviceaccount.yaml b/charts/konnectivity-agent/templates/server/serviceaccount.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "konnectivity-server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "konnectivity-server.labels" . | nindent 4 }}
+    kubernetes.io/cluster-service: "true"
diff --git a/charts/konnectivity-agent/values.yaml b/charts/konnectivity-agent/values.yaml
@@ -100,6 +100,8 @@ serviceMonitor:
   #  foo: bar
 
 server:
+  serviceAccount:
+    name: "konnectivity-server"
   serviceMonitor:
     enabled: false
     ## Set extraLabels for the serviceMonitor object.