[castai-evictor] remove config map cluster id source

Author: laimonasr

charts/castai-evictor/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.32.19
+version: 0.32.20
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

charts/castai-evictor/README.md

@@ -18,8 +18,6 @@ Cluster utilization defragmentation tool
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"windows"` |  |
 | aggressiveMode | bool | `false` | Specifies whether the Evictor can behave as aggressive if true, evictor will start considering single replica pods as long as they can be scheduled somewhere else. |
 | apiKeySecretRef | string | `""` | Name of secret with Token to be used for authorizing evictor access to the API apiKey and apiKeySecretRef are mutually exclusive The referenced secret must provide the token in .data["API_KEY"]. |
-| clusterIdConfigMapKeyRef.key | string | `"CLUSTER_ID"` | key of the cluster id value in the config map |
-| clusterIdConfigMapKeyRef.name | string | `""` | name and of the config map with cluster id |
 | clusterIdSecretKeyRef.key | string | `"CLUSTER_ID"` |  |
 | clusterIdSecretKeyRef.name | string | `""` |  |
 | clusterVPA | object | `{"enabled":true,"pollPeriodSeconds":300,"repository":"registry.k8s.io/cpa/cpvpa","resources":{},"version":"v0.8.4"}` | Cluster proportional vertical autoscaler for the evictor deployment https://github.com/kubernetes-sigs/cluster-proportional-vertical-autoscaler. |

charts/castai-evictor/templates/deployment.yaml

@@ -85,23 +85,12 @@ spec:
             - name: K8S_CLIENT_RATE_LIMITER_BURST
               value: {{ .Values.kubernetesClient.rateLimiter.burst | quote }}
             {{- if .Values.clusterIdSecretKeyRef.name }}
-            {{- if ne .Values.clusterIdConfigMapKeyRef.name "" }}
-            {{- fail "clusterIdConfigMapKeyRef and clusterIdSecretKeyRef are mutually exclusive" }}
-            {{- end }}
             - name: CLUSTER_ID
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.clusterIdSecretKeyRef.name }}
                   key: {{ .Values.clusterIdSecretKeyRef.key }}
             {{- end }}
-            {{- if .Values.clusterIdConfigMapKeyRef.name }}
-            - name: CLUSTER_ID
-              valueFrom:
-                configMapKeyRef:
-                  name: {{ .Values.clusterIdConfigMapKeyRef.name }}
-                  key: {{ .Values.clusterIdConfigMapKeyRef.key }}
-                  optional: false
-            {{- end }}
             {{- range $name, $value := .Values.additionalEnv }}
             - name: "{{ $name }}"
               value: "{{ $value }}"

charts/castai-evictor/values.yaml

@@ -186,13 +186,6 @@ containerSecurityContext:
     drop:
       - ALL
 
-# The referenced ConfigMap must provide the ClusterID in .data[<<.Values.clusterIdConfigMapKeyRef.key>>]
-clusterIdConfigMapKeyRef:
-  # clusterIdConfigMapKeyRef.name -- name and of the config map with cluster id
-  name: ""
-  # clusterIdConfigMapKeyRef.key -- key of the cluster id value in the config map
-  key: "CLUSTER_ID"
-
 # The referenced Secret must provide the ClusterID in .data[<<.Values.clusterIdSecretKeyRef.key>>]
 clusterIdSecretKeyRef:
   name: ""