Merge pull request #101 from signadot/more-bug-fixes

Remove explicit defaults from compileClusterConfig + make helm-chart

Author: daniel-de-vera

signadot/operator/templates/_helpers.tpl

@@ -7,10 +7,18 @@ cluster config template
 allowedNamespaces: {{ if gt (len $allowedNamespaces) 0 }}{{ printf "\n" }}{{ toYaml $allowedNamespaces | indent 2}}{{- else -}}[]{{- end }}
 {{- if (hasKey .Values "controlPlane") }}
 controlPlane:
-  proxy: {{ if (hasKey .Values.controlPlane "proxy") -}}{{ .Values.controlPlane.proxy }}{{- else -}}enabled{{- end }}
-  controlAPI: {{ if (hasKey .Values.controlPlane "controlAPI") -}}{{ .Values.controlPlane.controlAPI }}{{- else -}}https://api.signadot.com{{- end}}
-  tunnelAddr: {{ if (hasKey .Values.controlPlane "tunnelAddr") -}}{{ .Values.controlPlane.tunnelAddr }}{{- else -}}tunnel.signadot.com:443{{- end}}
-  tunnelTLS: {{ if (hasKey .Values.controlPlane "tunnelTLS") }}{{ .Values.controlPlane.tunnelTLS }}{{- else -}}true{{- end}}
+{{- if (hasKey .Values.controlPlane "proxy") }}
+  proxy: {{ .Values.controlPlane.proxy }}
+{{- end }}
+{{- if (hasKey .Values.controlPlane "controlAPI") }}
+  controlAPI: {{ .Values.controlPlane.controlAPI }}
+{{- end }}
+{{- if (hasKey .Values.controlPlane "tunnelAddr") }}
+  tunnelAddr: {{ .Values.controlPlane.tunnelAddr }}
+{{- end }}
+{{- if (hasKey .Values.controlPlane "tunnelTLS") }}
+  tunnelTLS: {{ .Values.controlPlane.tunnelTLS }}
+{{- end }}
 {{- if (hasKey .Values.controlPlane "proxyURL") }}
   proxyURL: {{ .Values.controlPlane.proxyURL }}
 {{- end }}

signadot/operator/templates/agent-deployment.yaml

@@ -96,8 +96,10 @@ spec:
               name: '{{ $oldSecret := (lookup "v1" "Secret" "signadot" "cluster-agent")
                 }} {{- with .Values }} {{- with .controlPlane }} {{- with .tokenSecret
                 }} {{- . }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
-                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }}cluster-token
-                {{- end }} {{- else }}cluster-token {{- end }}'
+                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }} {{-
+                if $oldSecret }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token
+                {{- end }} {{- end }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
+                }} {{- else }}cluster-token {{- end }} {{- end }}'
           - configMap:
               items:
               - key: cluster_config.yaml

signadot/operator/templates/signadot-controller-manager-deployment.yaml

@@ -144,8 +144,10 @@ spec:
               name: '{{ $oldSecret := (lookup "v1" "Secret" "signadot" "cluster-agent")
                 }} {{- with .Values }} {{- with .controlPlane }} {{- with .tokenSecret
                 }} {{- . }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
-                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }}cluster-token
-                {{- end }} {{- else }}cluster-token {{- end }}'
+                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }} {{-
+                if $oldSecret }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token
+                {{- end }} {{- end }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
+                }} {{- else }}cluster-token {{- end }} {{- end }}'
           - configMap:
               items:
               - key: cluster_config.yaml

signadot/operator/templates/traffic-manager-clusterrole.yaml

@@ -19,8 +19,10 @@ rules:
   - '{{ $oldSecret := (lookup "v1" "Secret" "signadot" "cluster-agent") }} {{- with
     .Values }} {{- with .controlPlane }} {{- with .tokenSecret }} {{- . }} {{- else
     }} {{- if $oldSecret }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token
-    {{- end }} {{- end }} {{- else }}cluster-token {{- end }} {{- else }}cluster-token
-    {{- end }}'
+    {{- end }} {{- end }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
+    }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }} {{- if $oldSecret
+    }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token {{- end }} {{- end
+    }}'
   resources:
   - secrets
   verbs:

signadot/operator/templates/traffic-manager-deployment.yaml

@@ -94,8 +94,10 @@ spec:
               name: '{{ $oldSecret := (lookup "v1" "Secret" "signadot" "cluster-agent")
                 }} {{- with .Values }} {{- with .controlPlane }} {{- with .tokenSecret
                 }} {{- . }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
-                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }}cluster-token
-                {{- end }} {{- else }}cluster-token {{- end }}'
+                }} {{- else }}cluster-token {{- end }} {{- end }} {{- else }} {{-
+                if $oldSecret }}{{- $oldSecret.metadata.name }} {{- else }}cluster-token
+                {{- end }} {{- end }} {{- else }} {{- if $oldSecret }}{{- $oldSecret.metadata.name
+                }} {{- else }}cluster-token {{- end }} {{- end }}'
           - configMap:
               items:
               - key: cluster_config.yaml