dvcr: make templates nil-safe; remove temporary root values.yaml

Signed-off-by: Yachmenev Anton <[email protected]>

Author: yachmenevas

templates/dvcr/_helpers.tpl

@@ -4,6 +4,12 @@ true
 {{- end }}
 {{- end }}
 
+{{- /* Safe accessor for dvcr storage type to avoid nil pointer during linting */ -}}
+{{- define "dvcr.storageType" -}}
+{{- $mc := .Values.virtualization.internal.moduleConfig | default dict -}}
+{{- dig "dvcr" "storage" "type" "" $mc -}}
+{{- end -}}
+
 {{- define "dvcr.envs" -}}
 - name: REGISTRY_HTTP_TLS_CERTIFICATE
   value: /etc/ssl/docker/tls.crt
@@ -23,15 +29,15 @@ true
       name: dvcr-secrets
       key: salt
 
-{{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "PersistentVolumeClaim" }}
+{{- if eq (include "dvcr.storageType" .) "PersistentVolumeClaim" }}
 - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
   value: "/var/lib/registry"
-{{- else if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "ObjectStorage" }}
-  {{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.type "S3" }}
+{{- else if eq (include "dvcr.storageType" .) "ObjectStorage" }}
+  {{- if eq (dig "dvcr" "storage" "objectStorage" "type" "" .Values.virtualization.internal.moduleConfig) "S3" }}
 - name: REGISTRY_STORAGE_S3_REGION
-  value: "{{ .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.s3.region }}"
+  value: "{{ dig "dvcr" "storage" "objectStorage" "s3" "region" "" .Values.virtualization.internal.moduleConfig }}"
 - name: REGISTRY_STORAGE_S3_BUCKET
-  value: "{{ .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.s3.bucket }}"
+  value: "{{ dig "dvcr" "storage" "objectStorage" "s3" "bucket" "" .Values.virtualization.internal.moduleConfig }}"
 - name: REGISTRY_STORAGE_S3_ACCESSKEY
   valueFrom:
     secretKeyRef:
@@ -43,7 +49,7 @@ true
       name: dvcr-object-storage-credentials
       key: s3SecretKey
 - name: REGISTRY_STORAGE_S3_REGIONENDPOINT
-  value: "{{ .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.s3.regionEndpoint }}"
+  value: "{{ dig "dvcr" "storage" "objectStorage" "s3" "regionEndpoint" "" .Values.virtualization.internal.moduleConfig }}"
   {{- end }}
 {{- end }}
 {{- end }}
@@ -53,7 +59,7 @@ true
 - name: "dvcr-config"
   mountPath: "/etc/docker/registry"
 
-{{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "PersistentVolumeClaim" }}
+{{- if eq (include "dvcr.storageType" .) "PersistentVolumeClaim" }}
 - name: data
   mountPath: /var/lib/registry/
 {{- end }}
@@ -74,7 +80,7 @@ true
   configMap:
     name: dvcr-config
 
-{{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "PersistentVolumeClaim" }}
+{{- if eq (include "dvcr.storageType" .) "PersistentVolumeClaim" }}
 - name: data
   persistentVolumeClaim:
     claimName: dvcr
@@ -94,18 +100,18 @@ true
 
 
 {{- define "dvcr.helm_lib_deployment_strategy_and_replicas_for_ha" -}}
-{{- if and (include "helm_lib_ha_enabled" .) (eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "ObjectStorage") }}
+{{- if and (include "helm_lib_ha_enabled" .) (eq (include "dvcr.storageType" .) "ObjectStorage") }}
 replicas: 2
 strategy:
   type: RollingUpdate
   rollingUpdate:
     maxSurge: 0
     maxUnavailable: 1
-{{- else if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "ObjectStorage" }}
+{{- else if eq (include "dvcr.storageType" .) "ObjectStorage" }}
 replicas: 1
 strategy:
   type: RollingUpdate
-{{- else if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "PersistentVolumeClaim" }}
+{{- else if eq (include "dvcr.storageType" .) "PersistentVolumeClaim" }}
 replicas: 1
 strategy:
   type: Recreate
@@ -116,7 +122,7 @@ strategy:
   {{- $context := index . 0 -}}
   {{- $yes := index . 1 -}}
   {{- $no  := index . 2 -}}
-  {{- if and (include "helm_lib_ha_enabled" $context) (eq $context.Values.virtualization.internal.moduleConfig.dvcr.storage.type "ObjectStorage") }}
+  {{- if and (include "helm_lib_ha_enabled" $context) (eq (include "dvcr.storageType" $context) "ObjectStorage") }}
     {{- $yes -}}
   {{- else }}
     {{- $no -}}

templates/dvcr/pvc.yaml

@@ -1,6 +1,6 @@
 {{- if eq (include "dvcr.isEnabled" . ) "true"}}
-{{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "PersistentVolumeClaim" }}
-{{- $storageClassName := dig "storageClassName" "" .Values.virtualization.internal.moduleConfig.dvcr.storage.persistentVolumeClaim }}
+{{- if eq (include "dvcr.storageType" .) "PersistentVolumeClaim" }}
+{{- $storageClassName := dig "dvcr" "storage" "persistentVolumeClaim" "storageClassName" "" .Values.virtualization.internal.moduleConfig }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -12,7 +12,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .Values.virtualization.internal.moduleConfig.dvcr.storage.persistentVolumeClaim.size | quote }}
+      storage: {{ dig "dvcr" "storage" "persistentVolumeClaim" "size" "" .Values.virtualization.internal.moduleConfig | quote }}
   {{- if ne $storageClassName "" }}
   storageClassName: {{ $storageClassName }}
   {{- end }}

templates/dvcr/secret.yaml

@@ -40,7 +40,7 @@ type: kubernetes.io/dockerconfigjson
 data:
   {{- include "dvcr.generate_dockercfg" (list . $registry "admin" .Values.virtualization.internal.dvcr.passwordRW) | nindent 2 }}
 
-{{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.type "ObjectStorage"}}
+{{- if eq (include "dvcr.storageType" .) "ObjectStorage"}}
 ---
 apiVersion: v1
 kind: Secret
@@ -50,9 +50,9 @@ metadata:
   {{- include "helm_lib_module_labels" (list . (dict "app" "dvcr" )) | nindent 2 }}
 type: Opaque
 data:
-  {{- if eq .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.type "S3"}}
-  s3AccessKey: {{ .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.s3.accessKey | quote }}
-  s3SecretKey: {{ .Values.virtualization.internal.moduleConfig.dvcr.storage.objectStorage.s3.secretKey | quote }}
+  {{- if eq (dig "dvcr" "storage" "objectStorage" "type" "" .Values.virtualization.internal.moduleConfig) "S3"}}
+  s3AccessKey: {{ dig "dvcr" "storage" "objectStorage" "s3" "accessKey" "" .Values.virtualization.internal.moduleConfig | quote }}
+  s3SecretKey: {{ dig "dvcr" "storage" "objectStorage" "s3" "secretKey" "" .Values.virtualization.internal.moduleConfig | quote }}
   {{- end }}
 {{- end }}
 {{- end }}