From b3d454558968d4a075b7d65f549ab6ea36fd3dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?= Date: Mon, 10 Feb 2025 10:40:43 +0100 Subject: [PATCH] fix(local-setup): improve overlay handling and upgrading versions --- .../components/openmfp/repository.yaml | 2 +- .../kustomization.yaml | 2 +- .../patch-keycloak.yaml | 0 .../overlays/default-oci/kustomization.yaml | 10 ---------- .../default-oci/patch-openmfp-crds.yaml | 9 --------- .../overlays/default-oci/patch-openmfp.yaml | 9 --------- .../overlays/oci-arm64/kustomization.yaml | 8 ++++++++ .../overlays/oci-arm64/patch-keycloak.yaml | 15 +++++++++++++++ local-setup/scripts/start.sh | 19 +++++++++++++------ 9 files changed, 38 insertions(+), 36 deletions(-) rename local-setup/kustomize/overlays/{arm64 => default-arm64}/kustomization.yaml (79%) rename local-setup/kustomize/overlays/{arm64 => default-arm64}/patch-keycloak.yaml (100%) delete mode 100644 local-setup/kustomize/overlays/default-oci/kustomization.yaml delete mode 100644 local-setup/kustomize/overlays/default-oci/patch-openmfp-crds.yaml delete mode 100644 local-setup/kustomize/overlays/default-oci/patch-openmfp.yaml create mode 100644 local-setup/kustomize/overlays/oci-arm64/kustomization.yaml create mode 100644 local-setup/kustomize/overlays/oci-arm64/patch-keycloak.yaml diff --git a/local-setup/kustomize/components/openmfp/repository.yaml b/local-setup/kustomize/components/openmfp/repository.yaml index 0aebeeaab..069f19242 100644 --- a/local-setup/kustomize/components/openmfp/repository.yaml +++ b/local-setup/kustomize/components/openmfp/repository.yaml @@ -8,6 +8,6 @@ spec: url: oci://ghcr.io/openmfp/helm-charts/openmfp ref: # renovate: datasource=docker registryUrl=https://ghcr.io depName=ghcr.io/openmfp/helm-charts/openmfp - semver: 0.0.214 + semver: 0.0.215 secretRef: name: ghcr-credentials diff --git a/local-setup/kustomize/overlays/arm64/kustomization.yaml b/local-setup/kustomize/overlays/default-arm64/kustomization.yaml similarity index 79% rename from local-setup/kustomize/overlays/arm64/kustomization.yaml rename to local-setup/kustomize/overlays/default-arm64/kustomization.yaml index cecdd3b21..bd8c554e1 100644 --- a/local-setup/kustomize/overlays/arm64/kustomization.yaml +++ b/local-setup/kustomize/overlays/default-arm64/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../components/openmfp + - ../default patches: - path: patch-keycloak.yaml diff --git a/local-setup/kustomize/overlays/arm64/patch-keycloak.yaml b/local-setup/kustomize/overlays/default-arm64/patch-keycloak.yaml similarity index 100% rename from local-setup/kustomize/overlays/arm64/patch-keycloak.yaml rename to local-setup/kustomize/overlays/default-arm64/patch-keycloak.yaml diff --git a/local-setup/kustomize/overlays/default-oci/kustomization.yaml b/local-setup/kustomize/overlays/default-oci/kustomization.yaml deleted file mode 100644 index 6ba0f2543..000000000 --- a/local-setup/kustomize/overlays/default-oci/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../default - - ../../components/registry - -patches: -- path: patch-openmfp.yaml -- path: patch-openmfp-crds.yaml diff --git a/local-setup/kustomize/overlays/default-oci/patch-openmfp-crds.yaml b/local-setup/kustomize/overlays/default-oci/patch-openmfp-crds.yaml deleted file mode 100644 index 9124adbf2..000000000 --- a/local-setup/kustomize/overlays/default-oci/patch-openmfp-crds.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: OCIRepository -metadata: - name: openmfp-crds - namespace: openmfp-system -spec: - url: oci://registry.default.svc.cluster.local:5000/openmfp/openmfp-crds - ref: - semver: 0.0.15 \ No newline at end of file diff --git a/local-setup/kustomize/overlays/default-oci/patch-openmfp.yaml b/local-setup/kustomize/overlays/default-oci/patch-openmfp.yaml deleted file mode 100644 index 2f85e9889..000000000 --- a/local-setup/kustomize/overlays/default-oci/patch-openmfp.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: OCIRepository -metadata: - name: openmfp - namespace: openmfp-system -spec: - url: oci://registry.default.svc.cluster.local:5000/openmfp/openmfp - ref: - semver: 0.0.197 diff --git a/local-setup/kustomize/overlays/oci-arm64/kustomization.yaml b/local-setup/kustomize/overlays/oci-arm64/kustomization.yaml new file mode 100644 index 000000000..e02b2e005 --- /dev/null +++ b/local-setup/kustomize/overlays/oci-arm64/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../oci + +patches: +- path: patch-keycloak.yaml diff --git a/local-setup/kustomize/overlays/oci-arm64/patch-keycloak.yaml b/local-setup/kustomize/overlays/oci-arm64/patch-keycloak.yaml new file mode 100644 index 000000000..a4b31687f --- /dev/null +++ b/local-setup/kustomize/overlays/oci-arm64/patch-keycloak.yaml @@ -0,0 +1,15 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: openmfp + namespace: openmfp-system +spec: + values: + keycloak: + keycloak: + extraEnvVars: + - name: JAVA_OPTS_APPEND + value: |- + -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local + -XX:UseSVE=0 + diff --git a/local-setup/scripts/start.sh b/local-setup/scripts/start.sh index a40a7fe7b..13e0e7581 100755 --- a/local-setup/scripts/start.sh +++ b/local-setup/scripts/start.sh @@ -52,7 +52,12 @@ helm upgrade -i -n flux-system --create-namespace flux oci://ghcr.io/fluxcd-comm echo -e "${COL}[$(date '+%H:%M:%S')] Starting deployments ${COL_RES}" if [ "${1}" == "oci" ]; then - kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/default-oci + if [[ "$(uname -m)" == "arm64" ]]; then + echo -e "${COL}[$(date '+%H:%M:%S')] ARM64 architecture detected, applying patch ${COL_RES}" + kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/oci-arm64 + else + kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/oci + fi sleep 10 # give time for the 'registry' pod to be created kubectl wait --namespace default \ @@ -84,13 +89,15 @@ if [ "${1}" == "oci" ]; then fi done else - kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/default + if [[ "$(uname -m)" == "arm64" ]]; then + echo -e "${COL}[$(date '+%H:%M:%S')] ARM64 architecture detected, applying patch ${COL_RES}" + kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/default-arm64 + else + kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/default + fi fi -if [[ "$(uname -m)" == "arm64" ]]; then - echo -e "${COL}[$(date '+%H:%M:%S')] ARM64 architecture detected, applying patch ${COL_RES}" - kubectl apply -k $SCRIPT_DIR/../kustomize/overlays/arm64 -fi + echo -e "${COL}[$(date '+%H:%M:%S')] Creating necessary secrets ${COL_RES}" kubectl create secret docker-registry ghcr-credentials -n openmfp-system --docker-server=ghcr.io --docker-username=$ghUser --docker-password=$ghToken --dry-run=client -o yaml | kubectl apply -f -