[metal-operator] base64 encoded secret (#6584)

* [metal-operator] base64 encoded secret * moves to new vault secret injector * use ipmi ironic user * typo * adds remoteboard values (now in secrets)
sapcc · Jun 4, 2024 · 2eedd0e · 2eedd0e
1 parent 0886ba3
commit 2eedd0e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/system/kustomize/metal-operator/patch-metal-operator-deployment.yaml b/system/kustomize/metal-operator/patch-metal-operator-deployment.yaml
@@ -14,7 +14,7 @@ spec:
           args:
           - --leader-elect
           - --mac-prefixes-file=/etc/macdb/macdb.yaml
-          - --probe-image=ghcr.io/afritzler/metalprobe:latest
+          - --probe-image=keppel.eu-de-1.cloud.sap/ccloud-ghcr-io-mirror/afritzler/metalprobe:latest
           - --probe-os-image=ghcr.io/ironcore-dev/os-images/gardenlinux:1443.3
           - --insecure=false
           - --registry-url=http://[2a10:afc0:e013:d002::]:30010

diff --git a/system/metal-operator-core/templates/etc/macdb.yaml b/system/metal-operator-core/templates/etc/macdb.yaml
@@ -0,0 +1,9 @@
+macPrefixes:
+- macPrefix: c4cbe1b1
+  manufacturer: Dell
+  protocol: Redfish
+  port: 80
+  type: bmc
+  defaultCredentials:
+    - username: {{ .Values.remoteboard.dell.username }}
+      password: {{ .Values.remoteboard.dell.password }}
diff --git a/system/metal-operator-core/templates/secret.yaml b/system/metal-operator-core/templates/secret.yaml
@@ -5,13 +5,5 @@ metadata:
   namespace: metal-operator-system
 type: Opaque
 data:
-  macdb.yaml: |
-    macPrefixes:
-    - macPrefix: c4cbe1b1
-      manufacturer: Dell
-      protocol: Redfish
-      port: 80
-      type: bmc
-      defaultCredentials:
-        - username: support
-          password: *vault(path: shared/ironic/remoteboard-user/support, field: password)
+  macdb.yaml: {{  include (print .Template.BasePath "/etc/macdb.yaml") . | b64enc }}
+
diff --git a/system/metal-operator-core/values.yaml b/system/metal-operator-core/values.yaml
@@ -55,3 +55,8 @@ metricsService:
       targetPort: https
   type: ClusterIP
 fullnameOverride: metal-operator
+
+remoteboard:
+  dell:
+    username: DEFINE_IN_REGION_VALUES
+    password: DEFINE_IN_REGION_VALUES