From b49ff79abdfc08af3e1295955e8904a450da4f25 Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Tue, 21 Oct 2025 09:01:22 -0700 Subject: [PATCH 1/2] Bump infra-managers version, and remove OSRM manual mode configuration --- argocd/applications/templates/infra-managers.yaml | 2 +- orch-configs/clusters/bkc.yaml | 1 - orch-configs/clusters/dev-minimal.yaml | 1 - orch-configs/clusters/dev.yaml | 1 - orch-configs/clusters/onprem-1k.yaml | 1 - orch-configs/clusters/onprem-explicit-proxy.yaml | 1 - orch-configs/clusters/onprem-oxm.yaml | 1 - orch-configs/clusters/onprem.yaml | 1 - orch-configs/templates/cluster.tpl | 3 --- 9 files changed, 1 insertion(+), 11 deletions(-) diff --git a/argocd/applications/templates/infra-managers.yaml b/argocd/applications/templates/infra-managers.yaml index 5689cd14a..19ccc4d34 100644 --- a/argocd/applications/templates/infra-managers.yaml +++ b/argocd/applications/templates/infra-managers.yaml @@ -21,7 +21,7 @@ spec: sources: - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} chart: infra/charts/{{$appName}} - targetRevision: 2.15.1 + targetRevision: 2.15.5 helm: releaseName: {{$appName}} valuesObject: diff --git a/orch-configs/clusters/bkc.yaml b/orch-configs/clusters/bkc.yaml index c9000f4f3..fe878cd65 100644 --- a/orch-configs/clusters/bkc.yaml +++ b/orch-configs/clusters/bkc.yaml @@ -29,7 +29,6 @@ root: - orch-configs/profiles/profile-aws.yaml - orch-configs/profiles/alerting-emails.yaml - orch-configs/profiles/enable-explicit-proxy.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/bkc.yaml diff --git a/orch-configs/clusters/dev-minimal.yaml b/orch-configs/clusters/dev-minimal.yaml index cc4d4f948..23615e03e 100644 --- a/orch-configs/clusters/dev-minimal.yaml +++ b/orch-configs/clusters/dev-minimal.yaml @@ -16,7 +16,6 @@ root: - orch-configs/profiles/proxy-none.yaml - orch-configs/profiles/profile-dev.yaml - orch-configs/profiles/artifact-rs-production-noauth.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/dev-minimal.yaml diff --git a/orch-configs/clusters/dev.yaml b/orch-configs/clusters/dev.yaml index 9f336ca01..ac5d43412 100644 --- a/orch-configs/clusters/dev.yaml +++ b/orch-configs/clusters/dev.yaml @@ -22,7 +22,6 @@ root: - orch-configs/profiles/artifact-rs-production-noauth.yaml - orch-configs/profiles/o11y-dev.yaml - orch-configs/profiles/alerting-emails-dev.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/dev.yaml diff --git a/orch-configs/clusters/onprem-1k.yaml b/orch-configs/clusters/onprem-1k.yaml index 07f788d87..9c4465d95 100644 --- a/orch-configs/clusters/onprem-1k.yaml +++ b/orch-configs/clusters/onprem-1k.yaml @@ -21,7 +21,6 @@ root: - orch-configs/profiles/alerting-emails.yaml - orch-configs/profiles/artifact-rs-production-noauth.yaml - orch-configs/profiles/o11y-onprem-1k.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/onprem-1k.yaml diff --git a/orch-configs/clusters/onprem-explicit-proxy.yaml b/orch-configs/clusters/onprem-explicit-proxy.yaml index 72015c069..8debb21f7 100644 --- a/orch-configs/clusters/onprem-explicit-proxy.yaml +++ b/orch-configs/clusters/onprem-explicit-proxy.yaml @@ -22,7 +22,6 @@ root: - orch-configs/profiles/artifact-rs-production-noauth.yaml - orch-configs/profiles/o11y-onprem.yaml - orch-configs/profiles/enable-explicit-proxy.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/onprem-explicit-proxy.yaml diff --git a/orch-configs/clusters/onprem-oxm.yaml b/orch-configs/clusters/onprem-oxm.yaml index a5e372204..47899e9de 100644 --- a/orch-configs/clusters/onprem-oxm.yaml +++ b/orch-configs/clusters/onprem-oxm.yaml @@ -17,7 +17,6 @@ root: - orch-configs/profiles/profile-oxm.yaml - orch-configs/profiles/artifact-rs-production-noauth.yaml - orch-configs/profiles/enable-explicit-proxy.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/onprem-oxm.yaml diff --git a/orch-configs/clusters/onprem.yaml b/orch-configs/clusters/onprem.yaml index ee7a51217..d02c5217c 100644 --- a/orch-configs/clusters/onprem.yaml +++ b/orch-configs/clusters/onprem.yaml @@ -21,7 +21,6 @@ root: - orch-configs/profiles/alerting-emails.yaml - orch-configs/profiles/artifact-rs-production-noauth.yaml - orch-configs/profiles/o11y-onprem.yaml - - orch-configs/profiles/enable-osrm-manual-mode.yaml - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/onprem.yaml diff --git a/orch-configs/templates/cluster.tpl b/orch-configs/templates/cluster.tpl index 42b732700..69f40420d 100644 --- a/orch-configs/templates/cluster.tpl +++ b/orch-configs/templates/cluster.tpl @@ -49,9 +49,6 @@ root: {{- end }} {{- if .Values.enableSquid }} - orch-configs/profiles/enable-explicit-proxy.yaml -{{- end }} -{{- if .Values.enableOsrmManualMode }} - - orch-configs/profiles/enable-osrm-manual-mode.yaml {{- end }} - orch-configs/profiles/resource-default.yaml - orch-configs/clusters/{{ .Values.name }}.yaml From fdb240bf584c7864f7347d912c6cfc576290e820 Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Wed, 29 Oct 2025 09:18:22 -0700 Subject: [PATCH 2/2] Remove profile enable-osrm-manual-mode.yaml --- orch-configs/profiles/enable-osrm-manual-mode.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 orch-configs/profiles/enable-osrm-manual-mode.yaml diff --git a/orch-configs/profiles/enable-osrm-manual-mode.yaml b/orch-configs/profiles/enable-osrm-manual-mode.yaml deleted file mode 100644 index 8a3908fe9..000000000 --- a/orch-configs/profiles/enable-osrm-manual-mode.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: 2025 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -# Includes OS Resource Manager (OSRM) configuration to enable/disable manual mode -# Enable this to set manual mode for OSRM - -argo: - infra-managers: - os-resource-manager-manual-mode: true