From 2fe3b3a6fdd5aa309398fef5407c97090af13aee Mon Sep 17 00:00:00 2001 From: Angel Kafazov Date: Mon, 16 Dec 2024 16:40:29 +0200 Subject: [PATCH 1/5] deploy server for extension-manager-operator On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov --- .../extension-manager-operator/templates/deployment.yaml | 1 + local-setup/kustomize/components/openmfp/release.yaml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/charts/extension-manager-operator/templates/deployment.yaml b/charts/extension-manager-operator/templates/deployment.yaml index 902e8c46d..2ce72d247 100644 --- a/charts/extension-manager-operator/templates/deployment.yaml +++ b/charts/extension-manager-operator/templates/deployment.yaml @@ -44,6 +44,7 @@ spec: image: {{ .Values.image.name }}:{{ .Chart.AppVersion }} imagePullPolicy: {{ include "common.imagePullPolicy" . }} name: server + {{- include "common.container.securityContext" . | nindent 10 }} ports: - containerPort: {{ .Values.validationServer.port }} {{- include "common.PortsMetricsHealth" . | nindent 10 -}} diff --git a/local-setup/kustomize/components/openmfp/release.yaml b/local-setup/kustomize/components/openmfp/release.yaml index 0a3d6eed2..61d8c600c 100644 --- a/local-setup/kustomize/components/openmfp/release.yaml +++ b/local-setup/kustomize/components/openmfp/release.yaml @@ -25,8 +25,15 @@ spec: gateway: name: gateway components: + infra: + enabled: true example-content: enabled: true + portal: + enabled: true + extension-manager-operator: + validationServer: + enabled: true example-content: istio: enabled: true From a4bff0e7e60499a263fd8056de4ce856b47ffd0d Mon Sep 17 00:00:00 2001 From: Angel Kafazov Date: Mon, 16 Dec 2024 16:47:30 +0200 Subject: [PATCH 2/5] fix(charts): update description and version for extension-manager-operator On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov --- charts/extension-manager-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/extension-manager-operator/Chart.yaml b/charts/extension-manager-operator/Chart.yaml index 75f1628f7..35f91a2bb 100644 --- a/charts/extension-manager-operator/Chart.yaml +++ b/charts/extension-manager-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: extension-manager-operator description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint type: application -version: 0.22.85 +version: 0.22.86 appVersion: "0.103.0" dependencies: - name: extension-manager-operator-crds From e9cd93eff5fbfaa80de7edffab0560d2d92b2da2 Mon Sep 17 00:00:00 2001 From: Angel Kafazov Date: Mon, 16 Dec 2024 17:07:59 +0200 Subject: [PATCH 3/5] On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov --- charts/extension-manager-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/extension-manager-operator/Chart.yaml b/charts/extension-manager-operator/Chart.yaml index 35f91a2bb..4a9fff575 100644 --- a/charts/extension-manager-operator/Chart.yaml +++ b/charts/extension-manager-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: extension-manager-operator description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint type: application -version: 0.22.86 +version: 0.22.87 appVersion: "0.103.0" dependencies: - name: extension-manager-operator-crds From 95c994167e3abf9145965af1d3749ddab76319e0 Mon Sep 17 00:00:00 2001 From: Angel Kafazov Date: Thu, 23 Jan 2025 10:36:59 +0200 Subject: [PATCH 4/5] fix template lookup in example-content, extension-manager-operator and keycloak charts On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov --- charts/example-content/Chart.yaml | 2 +- charts/example-content/templates/istio-virtual-service.yaml | 2 +- charts/extension-manager-operator/Chart.yaml | 2 +- .../extension-manager-operator/templates/virtual-service.yaml | 2 +- charts/keycloak/Chart.yaml | 2 +- charts/keycloak/templates/istio-virtualservice.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/example-content/Chart.yaml b/charts/example-content/Chart.yaml index fa85df4b6..a264b9ed9 100644 --- a/charts/example-content/Chart.yaml +++ b/charts/example-content/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.138.0" description: Helm Chart for the openmfp Portal name: example-content -version: 0.111.15 +version: 0.111.16 dependencies: - name: common version: 0.2.7 diff --git a/charts/example-content/templates/istio-virtual-service.yaml b/charts/example-content/templates/istio-virtual-service.yaml index 1079308d4..285641483 100644 --- a/charts/example-content/templates/istio-virtual-service.yaml +++ b/charts/example-content/templates/istio-virtual-service.yaml @@ -1,4 +1,4 @@ -{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} +{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: diff --git a/charts/extension-manager-operator/Chart.yaml b/charts/extension-manager-operator/Chart.yaml index 4a9fff575..2eb4c8287 100644 --- a/charts/extension-manager-operator/Chart.yaml +++ b/charts/extension-manager-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: extension-manager-operator description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint type: application -version: 0.22.87 +version: 0.22.88 appVersion: "0.103.0" dependencies: - name: extension-manager-operator-crds diff --git a/charts/extension-manager-operator/templates/virtual-service.yaml b/charts/extension-manager-operator/templates/virtual-service.yaml index ed6c18305..da7aa2ed7 100644 --- a/charts/extension-manager-operator/templates/virtual-service.yaml +++ b/charts/extension-manager-operator/templates/virtual-service.yaml @@ -1,4 +1,4 @@ -{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} +{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} {{- if .Values.validationServer.enabled }} apiVersion: networking.istio.io/v1alpha3 kind: VirtualService diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml index 41bdcb86c..e6fc7c906 100644 --- a/charts/keycloak/Chart.yaml +++ b/charts/keycloak/Chart.yaml @@ -3,7 +3,7 @@ name: keycloak description: A Helm chart to deploy keycloak as OIDC provider in openmfp type: application -version: 0.60.13 +version: 0.60.14 appVersion: "1.16.0" dependencies: diff --git a/charts/keycloak/templates/istio-virtualservice.yaml b/charts/keycloak/templates/istio-virtualservice.yaml index b887882d2..8794b296f 100644 --- a/charts/keycloak/templates/istio-virtualservice.yaml +++ b/charts/keycloak/templates/istio-virtualservice.yaml @@ -1,4 +1,4 @@ -{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} +{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}} apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: From 80ed28d5bb882e4c9931cc09023376f0dc08e599 Mon Sep 17 00:00:00 2001 From: Angel Kafazov Date: Thu, 23 Jan 2025 10:53:44 +0200 Subject: [PATCH 5/5] fix(charts): downgrade version for extension-manager-operator to 0.22.86 On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov --- charts/extension-manager-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/extension-manager-operator/Chart.yaml b/charts/extension-manager-operator/Chart.yaml index 2eb4c8287..35f91a2bb 100644 --- a/charts/extension-manager-operator/Chart.yaml +++ b/charts/extension-manager-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: extension-manager-operator description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint type: application -version: 0.22.88 +version: 0.22.86 appVersion: "0.103.0" dependencies: - name: extension-manager-operator-crds