helm chart updates

.gitlab-ci.yml

@@ -18,11 +18,32 @@ build_container:
   stage: build
   image:  deps.global.bsf.tools/quay.io/buildah/stable:latest
   variables:
-    IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
+    IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF"
   before_script:
     - mkdir -p /tmp/buildah-storage
     - export BUILDAH_ROOT="/tmp/buildah-storage"
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
   script:
     - buildah bud --build-arg NPM_REGISTRY=https://deps.global.bsf.tools/artifactory/api/npm/registry.npmjs.org/ --storage-driver vfs --isolation chroot -t $IMAGE_NAME .
-    - buildah push --storage-driver vfs $IMAGE_NAME
+    - buildah push --storage-driver vfs $IMAGE_NAME
+
+deploy_helm_charts:
+  stage: deploy
+  image:
+    name: deps.global.bsf.tools/registry-1.docker.io/alpine/k8s:1.29.12
+  parallel:
+    matrix:
+      # - ENV: "prod"
+      #   VALUES_FILE: "helm/values-prod.yaml"
+      #   CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+      #   NAMESPACE: "bsf-services-namespace"
+        # ONLY: "main"
+      - ENV: "dev"
+        VALUES_FILE: "helm/values.yaml"
+        CONTEXT: "esv/bsf/bsf-services/gitlab-kaas-agent-config:services-prod-agent"
+        NAMESPACE: "bsf-services-dev-namespace"
+        # ONLY: ["branches", "!main"]
+  script:
+    - kubectl config use-context $CONTEXT
+    - |
+      helm upgrade --install gitlab-servicedesk-agent-$ENV ./helm --namespace $NAMESPACE -f $VALUES_FILE --set image.repository=$CI_REGISTRY_IMAGE --set image.tag=$CI_COMMIT_REF

helm/templates/_helpers.tpl

@@ -1,14 +1,14 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "datalake.name" -}}
+{{- define "w13.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create a default fully qualified app name.
 */}}
-{{- define "datalake.fullname" -}}
+{{- define "w13.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -24,16 +24,16 @@ Create a default fully qualified app name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "datalake.chart" -}}
+{{- define "w13.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "datalake.labels" -}}
-helm.sh/chart: {{ include "datalake.chart" . }}
-{{ include "datalake.selectorLabels" . }}
+{{- define "w13.labels" -}}
+helm.sh/chart: {{ include "w13.chart" . }}
+{{ include "w13.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -43,17 +43,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "datalake.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "datalake.name" . }}
+{{- define "w13.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "w13.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "datalake.serviceAccountName" -}}
+{{- define "w13.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "datalake.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "w13.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

helm/templates/deployment.yaml

@@ -1,16 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "datalake.fullname" . }}
+  name: {{ include "w13.fullname" . }}
   labels:
-    {{- include "datalake.labels" . | nindent 4 }}
+    {{- include "w13.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "datalake.selectorLabels" . | nindent 6 }}
+      {{- include "w13.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -18,13 +18,13 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "datalake.selectorLabels" . | nindent 8 }}
+        {{- include "w13.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "datalake.serviceAccountName" . }}
+      serviceAccountName: {{ include "w13.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -53,7 +53,7 @@ spec:
         - name: DATABASE_URL
           valueFrom:
             secretKeyRef:
-              name: {{ include "datalake.fullname" . }}-secrets
+              name: {{ include "w13.fullname" . }}-secrets
               key: database-url
         - name: STORAGE_BACKEND
           value: {{ .Values.config.storageBackend | quote }}
@@ -63,12 +63,12 @@ spec:
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: {{ include "datalake.fullname" . }}-secrets
+              name: {{ include "w13.fullname" . }}-secrets
               key: aws-access-key-id
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "datalake.fullname" . }}-secrets
+              name: {{ include "w13.fullname" . }}-secrets
               key: aws-secret-access-key
         - name: AWS_REGION
           value: {{ .Values.aws.region | quote }}
@@ -76,16 +76,16 @@ spec:
           value: {{ .Values.aws.bucketName | quote }}
         {{- else }}
         - name: MINIO_ENDPOINT
-          value: "{{ include "datalake.fullname" . }}-minio:9000"
+          value: "{{ include "w13.fullname" . }}-minio:9000"
         - name: MINIO_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "datalake.fullname" . }}-secrets
+              name: {{ include "w13.fullname" . }}-secrets
               key: minio-access-key
         - name: MINIO_SECRET_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "datalake.fullname" . }}-secrets
+              name: {{ include "w13.fullname" . }}-secrets
               key: minio-secret-key
         - name: MINIO_BUCKET_NAME
           value: "test-artifacts"

helm/values.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 
 image:
-  repository: datalake
+  repository: w13
   pullPolicy: IfNotPresent
   tag: "latest"
 
@@ -37,7 +37,7 @@ ingress:
   className: ""
   annotations: {}
   hosts:
-    - host: datalake.local
+    - host: w13.local
       paths:
         - path: /
           pathType: Prefix
@@ -74,7 +74,7 @@ postgresql:
   auth:
     username: user
     password: password
-    database: datalake
+    database: w13
   primary:
     persistence:
       enabled: true