CX bundle updated, Dockerfiles and Skaffold file. Multiservice inner-…

…loop skaffold file added in deployment repo
eiffel-community · Aug 21, 2019 · 5e226a9 · 5e226a9
1 parent 4656a7c
commit 5e226a9
Show file tree

Hide file tree

Showing 19 changed files with 274 additions and 85 deletions.
diff --git a/bundles/Cx/build-source/gerrit-postgres-config/entrypoint.sh b/bundles/Cx/build-source/gerrit-postgres-config/entrypoint.sh
@@ -120,11 +120,15 @@ sed -i -e "s%CX_IMAGE_REGISTRY_SED%${CX_IMAGE_REGISTRY//&/\\&}%g" $SKAFFOLD_FILE
 sed -i -e "s%CX_IMAGE_REPOSITORY_SED%${CX_IMAGE_REPOSITORY//&/\\&}%g" $SKAFFOLD_FILE_MS_BACKEND_TO_SED
 sed -i -e "s%K8S_DOMAIN_NAME_TO_SED%${K8S_DOMAIN_NAME//&/\\&}%g" $SKAFFOLD_FILE_MS_BACKEND_TO_SED
 
-SKAFFOLD_FILE_MS_FRONTEND_TO_SED=/seed/projects/ms-frontend/skaffold.yaml
+SKAFFOLD_FILE_MS_FRONTEND_TO_SED=/seed/projects/deployments/skaffold.yaml
 sed -i -e "s%CX_IMAGE_REGISTRY_SED%${CX_IMAGE_REGISTRY//&/\\&}%g" $SKAFFOLD_FILE_MS_FRONTEND_TO_SED
 sed -i -e "s%CX_IMAGE_REPOSITORY_SED%${CX_IMAGE_REPOSITORY//&/\\&}%g" $SKAFFOLD_FILE_MS_FRONTEND_TO_SED
 sed -i -e "s%K8S_DOMAIN_NAME_TO_SED%${K8S_DOMAIN_NAME//&/\\&}%g" $SKAFFOLD_FILE_MS_FRONTEND_TO_SED
 
+SKAFFOLD_FILE_DEPLOYMENT_TO_SED=/seed/projects/ms-frontend/skaffold.yaml
+sed -i -e "s%CX_IMAGE_REGISTRY_SED%${CX_IMAGE_REGISTRY//&/\\&}%g" $SKAFFOLD_FILE_DEPLOYMENT_TO_SED
+sed -i -e "s%CX_IMAGE_REPOSITORY_SED%${CX_IMAGE_REPOSITORY//&/\\&}%g" $SKAFFOLD_FILE_DEPLOYMENT_TO_SED
+sed -i -e "s%K8S_DOMAIN_NAME_TO_SED%${K8S_DOMAIN_NAME//&/\\&}%g" $SKAFFOLD_FILE_DEPLOYMENT_TO_SED
 
 source ./setup.sh
 

diff --git a/...es/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-dev.yaml b/...es/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-dev.yaml
@@ -57,7 +57,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  ConfigMapvolumeMountPath: /deployments/config   # Needed for spring-boot application.properties via ConfigMap
+  ConfigMapvolumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
   #DatavolumeMountPath:   # /data  Leave empty if no volume is needed, OBS needed if persistence.enabled: true!
 
 

diff --git a/...s/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-prod.yaml b/...s/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-prod.yaml
@@ -57,7 +57,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  ConfigMapvolumeMountPath: /deployments/config   # Needed for spring-boot application.properties via ConfigMap
+  ConfigMapvolumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
   #DatavolumeMountPath:   # /data  Leave empty if no volume is needed, OBS needed if persistence.enabled: true!
 
 

diff --git a/.../Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-stage.yaml b/.../Cx/build-source/gerrit-postgres-config/projects/deployments/ms-backend/values-stage.yaml
@@ -57,7 +57,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  ConfigMapvolumeMountPath: /deployments/config   # Needed for spring-boot application.properties via ConfigMap
+  ConfigMapvolumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
   #DatavolumeMountPath:   # /data  Leave empty if no volume is needed, OBS needed if persistence.enabled: true!
 
 

diff --git a/...ild-source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/_helpers.tpl b/...ild-source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/_helpers.tpl
@@ -30,3 +30,10 @@ Create chart name and version as used by the chart label.
 {{- define "myapplication.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Format secret for pullsecret.
+*/}}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.imageCredentials.registry (printf "%s:%s" .Values.imageCredentials.username .Values.imageCredentials.password | b64enc) | b64enc }}
+{{- end }}
diff --git a/...ild-source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/secrets.yaml b/...ild-source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/secrets.yaml
@@ -20,20 +20,17 @@
 ## Maintainer: [email protected]
 ##
 ##--------------------------------------------------------------------------------------
+{{- if .Values.imageCredentials.password }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "myapplication.fullname" . }}
+  name: {{ .Values.image.pullSecret }}
   labels:
     app: {{ template "myapplication.name" . }}
     chart: {{ template "myapplication.chart" .  }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-type: Opaque
+type: kubernetes.io/dockerconfigjson
 data:
-  {{ if .Values.myapplication.password }}
-  myapplication-password: {{ .Values.myapplication.password | b64enc | quote }}
-  {{ else }}
-  myapplication-password: {{ randAlphaNum 10 | b64enc | quote }}
-  {{ end }}
-
+  .dockerconfigjson: {{ template "imagePullSecret" . }}    
+{{- end }}
diff --git a/...source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/statefulset.yaml b/...source/gerrit-postgres-config/projects/deployments/ms-frontend/templates/statefulset.yaml
@@ -46,11 +46,9 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
     spec:
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
+      {{- if .Values.image.pullSecret }}
+      imagePullSecrets: 
+        - name: {{ .Values.image.pullSecret }}
       {{- end }}
       {{- if .Values.rbacEnabled}}
       serviceAccountName: {{ template "myapplication.fullname" . }}
@@ -121,11 +119,6 @@ spec:
             value: "myapplication@$(MY_POD_IP)"
           - name: K8S_SERVICE_NAME
             value: "{{ template "myapplication.fullname" . }}"
-          - name: myapplication_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "myapplication.fullname" . }}
-                key: myapplication-password
         envFrom:
           - configMapRef:
               name: {{ template "myapplication.fullname" . }}-config-env-vars

diff --git a/...s/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-dev.yaml b/...s/Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-dev.yaml
@@ -36,16 +36,17 @@ image:
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
   pullPolicy: Always
-  ## Optionally specify an array of imagePullSecrets.
-  ## Secrets must be manually created in the namespace.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  # pullSecrets:
-  #   - myRegistrKeySecretName
+  ## Secrets must be manually created in the namespace. can be created with -> imageCredentials.registry/username/password
+  pullSecret: 
 
 ## does your cluster have rbac enabled? assume yes by default
 rbacEnabled: false
 
+imageCredentials:  # Secret (pullsecret), used together with image.pullSecret
+  registry: 
+  username: 
+  password: 
+
 ## section of specific values for application
 myapplication:
   # Serviceport and ingress mapping to service
@@ -59,13 +60,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  volumeMountPath: /deployments/config
-
-
-  # pullsecret
-
-  ## Disk free limit
-  diskFreeLimit: '"6GiB"'
+  volumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
 
   ## Environment Variable Configuration
   configurationEnvironmentVars: |

diff --git a/.../Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-prod.yaml b/.../Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-prod.yaml
@@ -36,16 +36,17 @@ image:
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
   pullPolicy: Always
-  ## Optionally specify an array of imagePullSecrets.
-  ## Secrets must be manually created in the namespace.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  # pullSecrets:
-  #   - myRegistrKeySecretName
+  ## Secrets must be manually created in the namespace. can be created with -> imageCredentials.registry/username/password
+  pullSecret: 
 
 ## does your cluster have rbac enabled? assume yes by default
 rbacEnabled: false
 
+imageCredentials:  # Secret (pullsecret), used together with image.pullSecret
+  registry: 
+  username: 
+  password: 
+
 ## section of specific values for application
 myapplication:
   # Serviceport and ingress mapping to service
@@ -59,13 +60,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  volumeMountPath: /deployments/config
-
-
-  # pullsecret
-
-  ## Disk free limit
-  diskFreeLimit: '"6GiB"'
+  volumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
 
   ## Environment Variable Configuration
   configurationEnvironmentVars: |

diff --git a/...Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-stage.yaml b/...Cx/build-source/gerrit-postgres-config/projects/deployments/ms-frontend/values-stage.yaml
@@ -36,16 +36,17 @@ image:
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
   pullPolicy: Always
-  ## Optionally specify an array of imagePullSecrets.
-  ## Secrets must be manually created in the namespace.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  # pullSecrets:
-  #   - myRegistrKeySecretName
+  ## Secrets must be manually created in the namespace. can be created with -> imageCredentials.registry/username/password
+  pullSecret: 
 
 ## does your cluster have rbac enabled? assume yes by default
 rbacEnabled: false
 
+imageCredentials:  # Secret (pullsecret), used together with image.pullSecret
+  registry: 
+  username: 
+  password: 
+
 ## section of specific values for application
 myapplication:
   # Serviceport and ingress mapping to service
@@ -59,13 +60,7 @@ myapplication:
   nodePort:
 
   # Volume Mount Path to ConfigMap
-  volumeMountPath: /deployments/config
-
-
-  # pullsecret
-
-  ## Disk free limit
-  diskFreeLimit: '"6GiB"'
+  volumeMountPath: /opt/target/config    # OBS must match jar/war file folder location in Dockerfile (-/config)
 
   ## Environment Variable Configuration
   configurationEnvironmentVars: |