ci: keppel deployment preperation (#400)

* ci: prepare deployment * Automatic application of license header --------- Co-authored-by: License Bot <[email protected]>
cloudoperators · Nov 21, 2024 · b5373cc · b5373cc
1 parent 41ebcb8
commit b5373cc
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 57 deletions.
diff --git a/scanner/keppel/chart/keppel-scanner/templates/_helpers.tpl b/scanner/keppel/chart/keppel-scanner/templates/_helpers.tpl
@@ -48,15 +48,4 @@ Selector labels
 {{- define "keppel-scanner.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "keppel-scanner.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "keppel-scanner.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "keppel-scanner.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
+{{- end }}
diff --git a/scanner/keppel/chart/keppel-scanner/templates/config/_scanner_config.yaml.tpl b/scanner/keppel/chart/keppel-scanner/templates/config/_scanner_config.yaml.tpl
diff --git a/scanner/keppel/chart/keppel-scanner/templates/configmap.yaml b/scanner/keppel/chart/keppel-scanner/templates/configmap.yaml
diff --git a/scanner/keppel/chart/keppel-scanner/templates/cronjob.yaml b/scanner/keppel/chart/keppel-scanner/templates/cronjob.yaml
@@ -24,6 +24,24 @@ spec:
               mountPath: "{{ .Values.scanner.config_mount_path }}"
               readOnly: true
             env:
+            - name: KEPPEL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name:  {{ .Release.Name }}-secret
+                  key: keppel_password
+            - name: KEPPEL_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Release.Name }}-secret
+                  key: keppel_username
+            - name:  KEPPEL_FQDN
+              value: {{ .Values.scanner.keppel.fqdn }}
+            - name: IDENTITY_ENDPOINT
+              value: {{ .Values.scanner.identity_endpoint }}
+            - name: KEPPEL_DOMAIN
+              value: {{ .Values.scanner.keppel.domain }}
+            - name: KEPPEL_PROJECT
+              value: {{ .Values.scanner.keppel.project }}
             - name: HEUREKA_API_TOKEN
               valueFrom:
                 secretKeyRef:

diff --git a/scanner/keppel/chart/keppel-scanner/templates/secrets.yaml b/scanner/keppel/chart/keppel-scanner/templates/secrets.yaml
@@ -7,4 +7,6 @@ metadata:
   name: {{ .Release.Name }}-secret
 type: Opaque
 data:
-  api_token: {{ .Values.scanner.api_token | b64enc }}
+  api_token: {{ .Values.scanner.heureka.api_token | b64enc }}
+  keppel_username: {{ .Values.scanner.keppel.username | b64enc }}
+  keppel_password: {{ .Values.scanner.keppel.password | b64enc }}
diff --git a/scanner/keppel/chart/keppel-scanner/templates/serviceaccount.yaml b/scanner/keppel/chart/keppel-scanner/templates/serviceaccount.yaml
diff --git a/scanner/keppel/chart/keppel-scanner/values.yaml b/scanner/keppel/chart/keppel-scanner/values.yaml
@@ -4,26 +4,21 @@
 # Default values for keppel-scanner.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 scanner:
-  api_token: "my_token"
-  heureka_url: "api.heureka.greenhouse-qa.eu-nl-1.cloud.sap"
-  config_mount_path: "/etc/heureka/config/keppel-scanner"
+  api_token: ""
+  heureka_url: ""
   schedule: "0 * * * *"
+  keppel:
+    username: ""
+    password: ""
+    fqdn: ""
+    domain: ""
+    project: ""
+  identity_endpoint: ""
+
 
 image:
   repository: ghcr.io/cloudoperators/heureka-scanner-keppel
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main"
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: false
-  # Automatically mount a ServiceAccount's API credentials?
-  automount: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  tag: ""