From 82542b122627f608c6d2dcd4563cd0bef33401b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?= Date: Fri, 25 Oct 2024 09:34:26 +0200 Subject: [PATCH 1/3] feat: allow to specify virtualworkspaceurl --- charts/account-operator/templates/deployment.yaml | 2 ++ charts/account-operator/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/charts/account-operator/templates/deployment.yaml b/charts/account-operator/templates/deployment.yaml index ce1c5da8d..667d2ab13 100644 --- a/charts/account-operator/templates/deployment.yaml +++ b/charts/account-operator/templates/deployment.yaml @@ -56,6 +56,8 @@ spec: env: - name: KCP_ENABLED value: "{{ .Values.kcp.enabled }}" + - name: VIRTUAL_WORKSPACE_URL + value: "{{ .Values.kcp.virtualWorkspaceUrl }}" {{- if .Values.kubeconfigSecret }} - name: KUBECONFIG value: /api-kubeconfig/kubeconfig diff --git a/charts/account-operator/values.yaml b/charts/account-operator/values.yaml index 4ff565347..bf2331cb2 100644 --- a/charts/account-operator/values.yaml +++ b/charts/account-operator/values.yaml @@ -25,5 +25,6 @@ deployment: kcp: enabled: false + virtualWorkspaceUrl: "" kubeconfigSecret: "" From dc93c0cb8400efa333a4fab8ef2b6d8c68dddb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?= Date: Fri, 25 Oct 2024 09:35:52 +0200 Subject: [PATCH 2/3] chore: bump chart version --- charts/account-operator/Chart.yaml | 2 +- .../tests/__snapshot__/deployment_test.yaml.snap | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/account-operator/Chart.yaml b/charts/account-operator/Chart.yaml index 5081f5aff..5a3f92280 100644 --- a/charts/account-operator/Chart.yaml +++ b/charts/account-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: account-operator description: A Helm chart for Kubernetes type: application -version: 0.1.17 +version: 0.1.18 appVersion: "0.60.0" dependencies: - name: account-operator-crds diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap index 8592f3627..ab8e76b55 100644 --- a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap @@ -96,6 +96,8 @@ operator match the snapshot: env: - name: KCP_ENABLED value: "false" + - name: VIRTUAL_WORKSPACE_URL + value: "" image: ghcr.io/openmfp/account-operator:0.0.0 livenessProbe: httpGet: @@ -235,6 +237,8 @@ operator match the snapshot (with kubeconfigSecret): env: - name: KCP_ENABLED value: "false" + - name: VIRTUAL_WORKSPACE_URL + value: "" - name: KUBECONFIG value: /api-kubeconfig/kubeconfig image: ghcr.io/openmfp/account-operator:0.0.0 From fb3fd59f96c1ccdbdeff69848d33c611140484a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?= Date: Fri, 25 Oct 2024 09:55:45 +0200 Subject: [PATCH 3/3] fix: fixed env variable name --- charts/account-operator/templates/deployment.yaml | 2 +- .../tests/__snapshot__/deployment_test.yaml.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/account-operator/templates/deployment.yaml b/charts/account-operator/templates/deployment.yaml index 667d2ab13..1e9724f1e 100644 --- a/charts/account-operator/templates/deployment.yaml +++ b/charts/account-operator/templates/deployment.yaml @@ -56,7 +56,7 @@ spec: env: - name: KCP_ENABLED value: "{{ .Values.kcp.enabled }}" - - name: VIRTUAL_WORKSPACE_URL + - name: KCP_VIRTUAL_WORKSPACE_URL value: "{{ .Values.kcp.virtualWorkspaceUrl }}" {{- if .Values.kubeconfigSecret }} - name: KUBECONFIG diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap index ab8e76b55..93cb7c8b3 100644 --- a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap +++ b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap @@ -96,7 +96,7 @@ operator match the snapshot: env: - name: KCP_ENABLED value: "false" - - name: VIRTUAL_WORKSPACE_URL + - name: KCP_VIRTUAL_WORKSPACE_URL value: "" image: ghcr.io/openmfp/account-operator:0.0.0 livenessProbe: @@ -237,7 +237,7 @@ operator match the snapshot (with kubeconfigSecret): env: - name: KCP_ENABLED value: "false" - - name: VIRTUAL_WORKSPACE_URL + - name: KCP_VIRTUAL_WORKSPACE_URL value: "" - name: KUBECONFIG value: /api-kubeconfig/kubeconfig