ZO-4519: Retrieve credentials from vault instead of hardcoding them

ZeitOnline · Jan 24, 2024 · b287973 · b287973
1 parent 81f416d
commit b287973
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/smoketest/conftest.py b/smoketest/conftest.py
@@ -1,12 +1,13 @@
 from io import BytesIO
 from urllib.parse import urlparse
+import os
 import xmlrpc.client
 
 import pytest
 import webdav3.client
 
 
-XMLRPC_AUTH = 'nightwatch:FecOdyuecl4OdAgosLong$'
+XMLRPC_AUTH = 'nightwatch:' + os.environ['VIVI_XMLRPC_PASSWORD']
 CONFIG_STAGING = {
     'browser': {'baseurl': 'https://www.staging.zeit.de'},
     'vivi': {

diff --git a/smoketest/k8s/base/kustomization.yaml b/smoketest/k8s/base/kustomization.yaml
@@ -5,6 +5,20 @@ components:
 - github.com/ZeitOnline/kustomize/components/nightwatch?ref=1.3
 - versions
 
+patches:
+- target:
+    kind: Deployment
+    name: nightwatch
+  patch: |
+    - op: add
+      path: /spec/template/spec/containers/0/env
+      value:
+        - name: VIVI_XMLRPC_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: principals
+              key: vivi_zeit.cms.principals_system.nightwatch
+
 # See https://github.com/ZeitOnline/gh-action-workflows/blob/main/.github/workflows/nightwatch-build.yaml
 images:
 - name: nightwatch

diff --git a/smoketest/k8s/staging/kustomization.yaml b/smoketest/k8s/staging/kustomization.yaml
@@ -10,7 +10,7 @@ patches:
     name: nightwatch
   patch: |-
     - op: add
-      path: /spec/template/spec/containers/0/env
+      path: /spec/template/spec/containers/0/env/-
       value:
-        - name: HTTPS_PROXY
-          value: http://static-ip-proxy.ops.zeit.de:3128
+        name: HTTPS_PROXY
+        value: http://static-ip-proxy.ops.zeit.de:3128