Merge branch 'main' into EMF_HELMDEPLOY_2026_01

sunil-parida · web-flow · commit e45895da8c32 · 2026-04-20T13:09:17.000+05:30
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
+# SPDX-FileCopyrightText: 2026 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -7,10 +7,10 @@
 # someone opens a pull request.
 
 # Everything requires Platform team review by default
-* @johnoloughlin @garyloug @palade @rranjan3 @krishnajs @scottmbaker @damiankopyto @cjnolan @SushilLakra @soniabha-intc @guptagunjan @sys-orch-approve @ram-srini @shankarsrinivas1 @sunil-parida @vigneshintel
+* @johnoloughlin @garyloug @palade @rranjan3 @krishnajs @scottmbaker @damiankopyto @cjnolan @SushilLakra @soniabha-intc @guptagunjan @sys-orch-approve @ram-srini @shankarsrinivas1 @sunil-parida
 
 # CI files
-.github/ @adimoft @daveroge @shanedonohue @manilk1x @johnoloughlin @garyloug @palade @rranjan3 @krishnajs @scottmbaker @damiankopyto @cjnolan @SushilLakra @soniabha-intc @guptagunjan @sys-orch-approve @ram-srini @shankarsrinivas1 @sunil-parida @vigneshintel
+.github/ @adimoft @daveroge @shanedonohue @manilk1x @johnoloughlin @garyloug @palade @rranjan3 @krishnajs @scottmbaker @damiankopyto @cjnolan @SushilLakra @soniabha-intc @guptagunjan @sys-orch-approve @ram-srini @shankarsrinivas1 @sunil-parida
 
 # Dependabot is used to manage dependencies in this repository. It is configured to automatically open pull requests to
 # update dependencies when new versions are available. The following files are managed by Dependabot and do not require
diff --git a/.github/actions/deploy_kind/action.yaml b/.github/actions/deploy_kind/action.yaml
@@ -49,7 +49,7 @@ runs:
 
   - name: Setup asdf and install dependencies
     id: install-deps
-    uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+    uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
   - name: Print current git hash
     shell: bash
diff --git a/.github/actions/deploy_on_prem/action.yaml b/.github/actions/deploy_on_prem/action.yaml
@@ -31,7 +31,7 @@ runs:
 
     - name: Setup asdf and install dependencies
       id: install-deps
-      uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+      uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
     - name: Check Oras
       run: |
diff --git a/.github/workflows/test-migration.yml b/.github/workflows/test-migration.yml
@@ -53,7 +53,7 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run test
         run: mage test:ChartsAvailableOnReleaseService
@@ -81,7 +81,7 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Inject default commonName for nginx-ingress-pxe-boots
         run: |
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Setup asdf and install dependencies
         id: install-deps
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Deploy Orchestrator ${{ matrix.version-tags }}
         env:
diff --git a/.github/workflows/virtual-integration.yml b/.github/workflows/virtual-integration.yml
@@ -158,7 +158,7 @@ jobs:
           git config --global url."https://${{ secrets.SYS_EMF_GH_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         run: mage -v lint:markdown
@@ -179,7 +179,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         working-directory: on-prem-installers
@@ -201,7 +201,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         run: mage lint:terraform
@@ -225,7 +225,7 @@ jobs:
         run: echo "ASDF_YAMLLINT_PIP_PACKAGES=pyyaml" >> $GITHUB_ENV
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]  
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b  
       - name: Run lint
         run: mage lint:yaml
 
@@ -245,7 +245,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         run: mage lint:helm
@@ -272,7 +272,7 @@ jobs:
           git config --global url."https://${{ secrets.SYS_EMF_GH_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         run: mage lint:golang
@@ -305,7 +305,7 @@ jobs:
           git config --global url."https://${{ secrets.SYS_EMF_GH_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Run lint
         run: |
@@ -364,7 +364,7 @@ jobs:
           git config --global url."https://${{ secrets.SYS_EMF_GH_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
 
       - name: Setup asdf and install dependencies
-        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@main  # zizmor: ignore[unpinned-uses]
+        uses: open-edge-platform/orch-ci/.github/actions/setup-asdf@b6610539eb98ed7bd5903e6629e48c1da39d883b
 
       - name: Get version tag
         id: get_version_tag
diff --git a/argocd/applications/custom/component-status.tpl b/argocd/applications/custom/component-status.tpl
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
+# SPDX-FileCopyrightText: 2026 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -26,6 +26,7 @@ traefikRoute:
   secretName: tls-orch
   middlewares:
     - validate-jwt
+    - cors
     - secure-headers
 {{- if .Values.argo.traefik }}
   tlsOption: {{ .Values.argo.traefik.tlsOption | default "" | quote }}
diff --git a/argocd/applications/custom/keycloak-operator.tpl b/argocd/applications/custom/keycloak-operator.tpl
@@ -25,6 +25,26 @@ operator:
   image: {{ .Values.argo.keycloakOperator.image | quote }}
 {{- end }}
 
+# Disable operator trace export to localhost:4317 to avoid repeated warning logs
+# while preserving upstream-required environment variables.
+operator:
+  container:
+    env:
+      - name: KUBERNETES_NAMESPACE
+        valueFrom:
+          fieldRef:
+            fieldPath: metadata.namespace
+      - name: RELATED_IMAGE_KEYCLOAK
+        value: '{{ "{{ .Values.operator.relatedImage.keycloak }}" }}'
+      - name: QUARKUS_OPERATOR_SDK_CONTROLLERS_KEYCLOAKREALMIMPORTCONTROLLER_NAMESPACES
+        value: JOSDK_WATCH_CURRENT
+      - name: QUARKUS_OPERATOR_SDK_CONTROLLERS_KEYCLOAKCONTROLLER_NAMESPACES
+        value: JOSDK_WATCH_CURRENT
+      # Runtime key to disable OTel SDK and stop OTLP export warnings.
+      # QUARKUS_OTEL_TRACES_EXPORTER is a build-time property and is not effective here.
+      - name: QUARKUS_OTEL_SDK_DISABLED
+        value: "true"
+
 # Override operator imagePullSecrets if specified
 {{- if and .Values.argo .Values.argo.keycloakOperator .Values.argo.keycloakOperator.imagePullSecrets }}
 imagePullSecrets:
diff --git a/argocd/applications/templates/component-status.yaml b/argocd/applications/templates/component-status.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 26.1.0
+      targetRevision: 26.1.2
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/keycloak-operator.yaml b/argocd/applications/templates/keycloak-operator.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/keycloak-operator
-      targetRevision: 26.1.2
+      targetRevision: 26.1.3
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/nexus-api-gw.yaml b/argocd/applications/templates/nexus-api-gw.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/nexus-api-gw
-      targetRevision: 26.1.0
+      targetRevision: 26.1.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/platform-keycloak.yaml b/argocd/applications/templates/platform-keycloak.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/keycloak-instance
-      targetRevision: 26.1.2
+      targetRevision: 26.1.3
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/tenancy-api-mapping.yaml b/argocd/applications/templates/tenancy-api-mapping.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 26.0.15
+      targetRevision: 26.1.0
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/traefik-extra-objects.yaml b/argocd/applications/templates/traefik-extra-objects.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 26.0.1
+      targetRevision: 26.1.0
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/web-ui-admin.yaml b/argocd/applications/templates/web-ui-admin.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-admin
-      targetRevision: 4.0.7
+      targetRevision: 4.0.8
       helm:
         releaseName: web-ui
         valuesObject:
diff --git a/argocd/applications/templates/web-ui-app-orch.yaml b/argocd/applications/templates/web-ui-app-orch.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-app-orch
-      targetRevision: 4.0.5
+      targetRevision: 4.0.7
       helm:
         releaseName: web-ui
         valuesObject:
diff --git a/argocd/applications/templates/web-ui-cluster-orch.yaml b/argocd/applications/templates/web-ui-cluster-orch.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-cluster-orch
-      targetRevision: 4.0.0
+      targetRevision: 4.0.1
       helm:
         releaseName: web-ui
         valuesObject:
diff --git a/argocd/applications/templates/web-ui-infra.yaml b/argocd/applications/templates/web-ui-infra.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-infra
-      targetRevision: 4.0.4
+      targetRevision: 4.0.6
       helm:
         releaseName: web-ui
         valuesObject:
diff --git a/argocd/applications/templates/web-ui-root.yaml b/argocd/applications/templates/web-ui-root.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-root
-      targetRevision: 4.0.8
+      targetRevision: 4.0.11
       helm:
         releaseName: web-ui
         valuesObject:
diff --git a/design-proposals/co-without-capi.md b/design-proposals/co-without-capi.md
diff --git a/design-proposals/platform-dns-simplification.md b/design-proposals/platform-dns-simplification.md
diff --git a/design-proposals/platform-installer-simplification-2.0.md b/design-proposals/platform-installer-simplification-2.0.md
diff --git a/design-proposals/platform-nexus-replacement.md b/design-proposals/platform-nexus-replacement.md
diff --git a/installer/tool-versions b/installer/tool-versions
diff --git a/terraform/orchestrator/cloud-inits/cloud_config.tftpl b/terraform/orchestrator/cloud-inits/cloud_config.tftpl
diff --git a/terraform/orchestrator/main.tf b/terraform/orchestrator/main.tf
diff --git a/terraform/orchestrator/variables.tf b/terraform/orchestrator/variables.tf
