#117, #116 - Fixing bug with use of clusterIdentifier and image names

pingidentity · Apr 13, 2021 · 96e1244 · 96e1244
1 parent 631f7a7
commit 96e1244
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 10 deletions.
diff --git a/...templates/pingdataconsole/deployment.yaml → ...s/templates/pingdataconsole/workload.yaml b/...templates/pingdataconsole/deployment.yaml → ...s/templates/pingdataconsole/workload.yaml
diff --git a/charts/ping-devops/templates/pingdatagovernance/service-cluster.yaml b/charts/ping-devops/templates/pingdatagovernance/service-cluster.yaml
@@ -2,4 +2,11 @@
 
 
 {{- define "pingdatagovernance.service-cluster" -}}
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+spec:
+  publishNotReadyAddresses: true
+  selector:
+    clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdatagovernance") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingdatagovernance/workload.yaml b/charts/ping-devops/templates/pingdatagovernance/workload.yaml
@@ -3,4 +3,9 @@
 
 
 {{- define "pingdatagovernance.workload" -}}
+spec:
+  template:
+    metadata:
+      labels:
+        clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdatagovernance") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingdatasync/service-cluster.yaml b/charts/ping-devops/templates/pingdatasync/service-cluster.yaml
@@ -2,4 +2,11 @@
 
 
 {{- define "pingdatasync.service-cluster" -}}
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+spec:
+  publishNotReadyAddresses: true
+  selector:
+    clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdatasync") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingdatasync/workload.yaml b/charts/ping-devops/templates/pingdatasync/workload.yaml
@@ -3,4 +3,9 @@
 
 
 {{- define "pingdatasync.workload" -}}
+spec:
+  template:
+    metadata:
+      labels:
+        clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdatasync") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingdirectory/service-cluster.yaml b/charts/ping-devops/templates/pingdirectory/service-cluster.yaml
@@ -9,4 +9,6 @@ metadata:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   publishNotReadyAddresses: true
+  selector:
+    clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdirectory") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingdirectory/workload.yaml b/charts/ping-devops/templates/pingdirectory/workload.yaml
@@ -7,5 +7,6 @@ spec:
   template:
     metadata:
       labels:
-        clusterIdentifier: {{ include "pinglib.fullimagename" . }}
+        foo: bar
+        clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingdirectory") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingfederate-admin/configmap.yaml b/charts/ping-devops/templates/pingfederate-admin/configmap.yaml
@@ -8,6 +8,6 @@ data:
   OPERATIONAL_MODE: CLUSTERED_CONSOLE
   CLUSTER_BIND_ADDRESS: "NON_LOOPBACK"
   CLUSTER_NAME: {{ $top.Release.Name | quote }}
-  DNS_QUERY_LOCATION: "{{ include "pinglib.fullimagename" . }}-cluster.{{ $top.Release.Namespace }}.svc.cluster.local"
+  DNS_QUERY_LOCATION: "{{ include "pinglib.fullname" . }}-cluster.{{ $top.Release.Namespace }}.svc.cluster.local"
   DNS_RECORD_TYPE: "A"
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingfederate-admin/service-cluster.yaml b/charts/ping-devops/templates/pingfederate-admin/service-cluster.yaml
@@ -7,4 +7,6 @@ metadata:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   publishNotReadyAddresses: true
+  selector:
+    clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingfederate") }}
 {{- end }}
diff --git a/charts/ping-devops/templates/pingfederate-admin/workload.yaml b/charts/ping-devops/templates/pingfederate-admin/workload.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     metadata:
       labels:
-        clusterIdentifier: {{ include "pinglib.fullimagename" . }}
+        clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingfederate") }}
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingfederate-engine/configmap.yaml b/charts/ping-devops/templates/pingfederate-engine/configmap.yaml
@@ -8,6 +8,6 @@ data:
   OPERATIONAL_MODE: CLUSTERED_ENGINE
   CLUSTER_BIND_ADDRESS: "NON_LOOPBACK"
   CLUSTER_NAME: {{ $top.Release.Name | quote }}
-  DNS_QUERY_LOCATION: "{{ include "pinglib.fullimagename" . }}-cluster.{{ $top.Release.Namespace }}.svc.cluster.local"
+  DNS_QUERY_LOCATION: "{{ include "pinglib.fullname" . }}-cluster.{{ $top.Release.Namespace }}.svc.cluster.local"
   DNS_RECORD_TYPE: "A"
 {{- end -}}
diff --git a/charts/ping-devops/templates/pingfederate-engine/workload.yaml b/charts/ping-devops/templates/pingfederate-engine/workload.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     metadata:
       labels:
-        clusterIdentifier: {{ include "pinglib.fullimagename" . }}
+        clusterIdentifier: {{ include "pinglib.addreleasename" (append . "pingfederate") }}
 {{- end -}}
 
 
diff --git a/charts/ping-devops/templates/pinglib/_service-cluster.tpl b/charts/ping-devops/templates/pinglib/_service-cluster.tpl
@@ -25,8 +25,6 @@ spec:
   {{- end }}
   {{- end }}
   {{- end }}
-  selector:
-    clusterIdentifier: {{ include "pinglib.selector.labels" . }}
 {{- end -}}
 
 

diff --git a/charts/ping-devops/templates/pinglib/_workload.tpl b/charts/ping-devops/templates/pinglib/_workload.tpl
@@ -38,7 +38,6 @@ spec:
     metadata:
       {{ include "pinglib.metadata.labels" .  | nindent 6  }}
         {{ include "pinglib.selector.labels" . | nindent 8 }}
-        clusterIdentifier: {{ include "pinglib.fullimagename" . }}
       {{ include "pinglib.metadata.workload.annotations" .  | nindent 6  }}
       annotations: {{ include "pinglib.annotations.vault" $v.vault | nindent 8 }}
         {{ $prodChecksum := include (print $top.Template.BasePath "/" $v.name "/configmap.yaml") $top | sha256sum }}
@@ -132,7 +131,7 @@ spec:
         resources: {{ toYaml $v.container.resources | nindent 10 }}
         {{- if or (and (eq $v.workload.type "StatefulSet") $v.workload.statefulSet.persistentvolume.enabled) $v.privateCert.generate }}
         volumeMounts:
-        {{- if eq $v.workload.type "StatefulSet" }}
+        {{- if and (eq $v.workload.type "StatefulSet") $v.workload.statefulSet.persistentvolume.enabled }}
         {{- range $volName, $val := $v.workload.statefulSet.persistentvolume.volumes }}
         - name: {{ $volName }}{{ if eq "none" $v.addReleaseNameToResource }}-{{ $top.Release.Name }}{{ end }}
           mountPath: {{ .mountPath }}
@@ -157,7 +156,7 @@ spec:
       {{/*--------------------- Volumes ------------------*/}}
       {{- if or (and (eq $v.workload.type "StatefulSet") $v.workload.statefulSet.persistentvolume.enabled) $v.privateCert.generate }}
       volumes:
-      {{- if eq $v.workload.type "StatefulSet" }}
+      {{- if and (eq $v.workload.type "StatefulSet") $v.workload.statefulSet.persistentvolume.enabled }}
       {{- range $volName, $val := $v.workload.statefulSet.persistentvolume.volumes }}
       - name: {{ $volName }}{{ if eq "none" $v.addReleaseNameToResource }}-{{ $top.Release.Name }}{{ end }}
         persistentVolumeClaim: