🌱 Refactor konnectivity chart (#102)

* 🌱 Refactor konnectivity chart * Remove servicemonitor * Fix home * Change back chart name
syself · Jan 16, 2025 · c6aca9b · c6aca9b
1 parent cd16f9b
commit c6aca9b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 65 deletions.
diff --git a/charts/konnectivity-agent/Chart.yaml b/charts/konnectivity-agent/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: konnectivity-agent
-description: Helm Chart for deploying the konnectivity agent.
+description: Helm Chart for deploying the konnectivity agent, plus server RBAC.
 type: application
 home: https://github.com/syself/charts/tree/main/charts/konnectivity-agent
 maintainers:
@@ -11,7 +11,7 @@ dependencies:
   - name: cluster-proportional-autoscaler
     repository: https://kubernetes-sigs.github.io/cluster-proportional-autoscaler
     version: 1.1.0
+    appVersion: 1.8.6
     alias: proportional-autoscaler
     condition: proportional-autoscaler.enabled
-appVersion: v1.8.9
-version: 1.0.12
+version: 2.0.0
diff --git a/charts/konnectivity-agent/templates/server-serviceMonitor.yaml b/charts/konnectivity-agent/templates/server-serviceMonitor.yaml
diff --git a/...ts/konnectivity-agent/templates/rbac.yaml → .../templates/server/clusterrolebinding.yaml b/...ts/konnectivity-agent/templates/rbac.yaml → .../templates/server/clusterrolebinding.yaml
@@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: system:konnectivity-server
-  namespace: {{ .Release.Namespace }}
   labels:
-{{ include "konnectivity-agent.labels" . | indent 4 }}
+    {{- include "konnectivity-server.labels" . | nindent 4 }}
+    kubernetes.io/cluster-service: "true"
 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
diff --git a/...ivity-agent/templates/serviceMonitor.yaml → ...ivity-agent/templates/servicemonitor.yaml b/...ivity-agent/templates/serviceMonitor.yaml → ...ivity-agent/templates/servicemonitor.yaml
diff --git a/charts/konnectivity-agent/values.yaml b/charts/konnectivity-agent/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: registry.k8s.io/kas-network-proxy/proxy-agent
   pullPolicy: Always
 
-nameOverride: ""
+nameOverride: ''
 
 cluster:
   host:
@@ -26,22 +26,25 @@ pdb:
 serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: "konnectivity-agent"
+  name: 'konnectivity-agent'
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
   # runAsUser: 1000
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -58,8 +61,8 @@ nodeSelector: {}
 affinity: {}
 
 tolerations:
-- key: "CriticalAddonsOnly"
-  operator: "Exists"
+  - key: 'CriticalAddonsOnly'
+    operator: 'Exists'
 
 topologySpreadConstraints: {}
 
@@ -69,11 +72,11 @@ serviceMonitor:
   extraLabels: {}
   ## Scrape interval. If not set, the Prometheus default scrape interval is used.
   ##
-  interval: ""
+  interval: ''
 
   ## proxyUrl: URL of a proxy that should be used for scraping.
   ##
-  proxyUrl: ""
+  proxyUrl: ''
 
   ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
   ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
@@ -100,17 +103,19 @@ serviceMonitor:
   #  foo: bar
 
 server:
+  serviceAccount:
+    name: 'konnectivity-server'
   serviceMonitor:
     enabled: false
     ## Set extraLabels for the serviceMonitor object.
     extraLabels: {}
     ## Scrape interval. If not set, the Prometheus default scrape interval is used.
     ##
-    interval: ""
+    interval: ''
 
     ## proxyUrl: URL of a proxy that should be used for scraping.
     ##
-    proxyUrl: ""
+    proxyUrl: ''
 
     ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
@@ -139,18 +144,16 @@ server:
 proportional-autoscaler:
   enabled: false
   image:
-    tag: v1.8.9
+    tag: v1.9.0
   fullnameOverride: konnectivity-agent-proportional-autoscaler
   options:
     target: deployment/konnectivity-agent
-
   replicaCount: 2
-
-  # config:
-  #   linear:
-  #     coresPerReplica: 32
-  #     nodesPerReplica: 4
-  #     min: 2
-  #     max: 50
-  #     preventSinglePointFailure: true
-  #     includeUnschedulableNodes: true
+  config:
+    linear:
+      coresPerReplica: 32
+      nodesPerReplica: 4
+      min: 2
+      max: 50
+      preventSinglePointFailure: true
+      includeUnschedulableNodes: true