Add default values for helm chart (#144)

* Add default values for helm chart --------- Co-authored-by: Darius Mejeras <darius@mejeras.lt>
castai · Jun 19, 2023 · 2667b3b · 2667b3b
1 parent cb8b834
commit 2667b3b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/charts/castai-kvisor/templates/deployment.yaml b/charts/castai-kvisor/templates/deployment.yaml
@@ -77,21 +77,21 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SERVICE_NAME
-              value: {{ .Values.kvisor.serviceName | quote }}
+              value: {{ ((.Values.kvisor | default dict).serviceName | default "kvisor") | quote }}
             - name: SERVICE_PORT
-              value: {{ .Values.kvisor.servicePort | quote }}
+              value: {{ ((.Values.kvisor | default dict).servicePort | default 7070) | quote }}
             - name: CERTS_DIR
-              value: {{ .Values.kvisor.certsDir | quote }}
+              value: {{ ((.Values.kvisor | default dict).certsDir | default "/certs") | quote }}
             - name: CERTS_SECRET
-              value: {{ .Values.kvisor.certsSecret | quote }}
+              value: {{ ((.Values.kvisor | default dict).certsSecret | default "kvisor-certs") | quote }}
             - name: LEADER_ELECTION
-              value: {{ .Values.leaderElectionEnabled | quote }}
+              value: {{ (.Values.leaderElectionEnabled | default false) | quote }}
             - name: POLICY_ENFORCEMENT_ENABLED
-              value: {{ (.Values.policyEnforcement | default dict).enabled | quote }}
+              value: {{ ((.Values.policyEnforcement | default dict).enabled | default false) | quote }}
             - name: POLICY_ENFORCEMENT_WEBHOOK_NAME
-              value: {{ (.Values.policyEnforcement | default dict).webhookName | quote }}
+              value: {{ ((.Values.policyEnforcement | default dict).webhookName | default "kvisor.cast.ai") | quote }}
             - name: STATUS_PORT
-              value: {{ .Values.kvisor.statusPort | quote }}
+              value: {{ ((.Values.kvisor | default dict).statusPort | default 7071) | quote }}
             - name: API_URL
               value: {{ .Values.castai.apiURL | quote }}
             - name: CLUSTER_ID
@@ -127,10 +127,10 @@ spec:
             - containerPort: 6060
               name: http
               protocol: TCP
-            - containerPort: {{ .Values.kvisor.servicePort }}
+            - containerPort: {{ ((.Values.kvisor | default dict).servicePort | default 7070) }}
               name: webhook
               protocol: TCP
-            - containerPort: {{ .Values.kvisor.statusPort }}
+            - containerPort: {{ ((.Values.kvisor | default dict).statusPort | default 7071) }}
               name: status
               protocol: TCP
           livenessProbe:
@@ -156,4 +156,4 @@ spec:
           {{- end }}
         - name: certs
           secret:
-            secretName: {{ .Values.kvisor.certsSecret | quote }}
+            secretName: {{ ((.Values.kvisor | default dict).certsSecret | default "kvisor-certs") | quote }}
diff --git a/charts/castai-kvisor/templates/rbac.yaml b/charts/castai-kvisor/templates/rbac.yaml
@@ -135,7 +135,7 @@ rules:
     resources:
       - leases
     resourceNames:
-      - {{ .Values.kvisor.serviceName }}
+      - {{ ((.Values.kvisor | default dict).serviceName | default "kvisor") }}
     verbs:
       - get
       - create
@@ -163,7 +163,7 @@ rules:
     resources:
       - secrets
     resourceNames:
-      - {{ .Values.kvisor.certsSecret }}
+      - {{ ((.Values.kvisor | default dict).certsSecret | default "kvisor-certs") }}
     verbs:
       - get
       - update

diff --git a/charts/castai-kvisor/templates/secret.yaml b/charts/castai-kvisor/templates/secret.yaml
@@ -18,5 +18,5 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.kvisor.certsSecret }}
+  name: {{ ((.Values.kvisor | default dict).certsSecret | default "kvisor-certs") }}
   namespace: {{ .Release.Namespace }}
diff --git a/charts/castai-kvisor/templates/service.yaml b/charts/castai-kvisor/templates/service.yaml
@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.kvisor.serviceName }}
+  name: {{ ((.Values.kvisor | default dict).serviceName | default "kvisor") }}
 spec:
   selector:
     app.kubernetes.io/name: castai-kvisor
   ports:
     - name: webhook
       protocol: TCP
-      port: {{ .Values.kvisor.servicePort }}
+      port: {{ ((.Values.kvisor | default dict).servicePort | default 7070) }}
       targetPort: webhook
 {{- end}}
diff --git a/charts/castai-kvisor/templates/webhook.yaml b/charts/castai-kvisor/templates/webhook.yaml
@@ -50,9 +50,9 @@ webhooks:
     clientConfig:
       service:
         namespace: {{ .Release.Namespace }}
-        name: {{ .Values.kvisor.serviceName }}
+        name: {{ ((.Values.kvisor | default dict).serviceName | default "kvisor") }}
         path: /validate
-        port: {{ .Values.kvisor.servicePort }}
+        port: {{ ((.Values.kvisor | default dict).servicePort | default 7070) }}
     admissionReviewVersions: ["v1"]
     sideEffects: None
     timeoutSeconds: 5