Merge branch 'main' into vPRO-kvm-support-adr

ipsita-npg · web-flow · commit 059e98a398cf · 2025-11-12T11:12:33.000+05:30
diff --git a/.tool-versions b/.tool-versions
@@ -9,7 +9,7 @@ helm 3.11.1
 helm-diff 3.6.0
 helmfile 0.150.0
 jq 1.6
-kind 0.17.0
+kind 0.30.0
 kubectl 1.30.10
 mage 1.15.0
 oras 1.2.0
diff --git a/argocd-internal/applications/configs/copy-ca-cert-gateway-to-enic.yaml b/argocd-internal/applications/configs/copy-ca-cert-gateway-to-enic.yaml
@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Intentionally left blank
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd-internal/applications/templates/copy-ca-cert-gateway-to-enic.yaml b/argocd-internal/applications/templates/copy-ca-cert-gateway-to-enic.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.0
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd-internal/applications/values.yaml b/argocd-internal/applications/values.yaml
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Intentionally left blank
+# Intentionally left blank
diff --git a/argocd/applications/configs/aws-sm-get-rs-token.yaml b/argocd/applications/configs/aws-sm-get-rs-token.yaml
@@ -7,3 +7,5 @@ proxy:
   port: 8080
   name: aws-sm-proxy
 smSecret: release-service-token
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-app-gitea-cred-to-fleet.yaml b/argocd/applications/configs/copy-app-gitea-cred-to-fleet.yaml
@@ -12,3 +12,5 @@ keyName:
     target: username
   - source: password
     target: password
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-boots-to-gateway.yaml b/argocd/applications/configs/copy-ca-cert-boots-to-gateway.yaml
@@ -9,3 +9,5 @@ sourceSecretName: tls-boots
 keyName:
   - source: tls.crt
     target: ca.crt
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-boots-to-infra.yaml b/argocd/applications/configs/copy-ca-cert-boots-to-infra.yaml
@@ -9,3 +9,5 @@ sourceSecretName: tls-boots
 keyName:
   - source: tls.crt
     target: ca.crt
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-gateway-to-cattle.yaml b/argocd/applications/configs/copy-ca-cert-gateway-to-cattle.yaml
@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Intentionally left blank
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-gateway-to-infra.yaml b/argocd/applications/configs/copy-ca-cert-gateway-to-infra.yaml
@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Intentionally left blank
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-gitea-to-app.yaml b/argocd/applications/configs/copy-ca-cert-gitea-to-app.yaml
@@ -9,3 +9,5 @@ sourceSecretName: gitea-tls-certs
 keyName:
   - source: tls.crt
     target: ca.crt
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-ca-cert-gitea-to-cluster.yaml b/argocd/applications/configs/copy-ca-cert-gitea-to-cluster.yaml
@@ -9,3 +9,5 @@ sourceSecretName: gitea-tls-certs
 keyName:
   - source: tls.crt
     target: ca.crt
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-cluster-gitea-cred-to-fleet.yaml b/argocd/applications/configs/copy-cluster-gitea-cred-to-fleet.yaml
@@ -12,3 +12,5 @@ keyName:
     target: username
   - source: password
     target: password
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-keycloak-admin-to-infra.yaml b/argocd/applications/configs/copy-keycloak-admin-to-infra.yaml
@@ -9,3 +9,5 @@ sourceSecretName: platform-keycloak
 keyName:
   - source: admin-password
     target: admin-password
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/copy-rs-token-to-cluster.yaml b/argocd/applications/configs/copy-rs-token-to-cluster.yaml
@@ -9,3 +9,5 @@ sourceSecretName: release-service-token
 keyName:
   - source: token
     target: token
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/fleet-rs-secret.yaml b/argocd/applications/configs/fleet-rs-secret.yaml
@@ -4,3 +4,5 @@
 
 matchClusterLabels:
   app.edge-orchestrator.intel.com/fleet-rs-secret: "true"
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/oci-secret.yaml b/argocd/applications/configs/oci-secret.yaml
@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 remoteNamespace: orch-secret
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/rs-image-pull-secrets.yaml b/argocd/applications/configs/rs-image-pull-secrets.yaml
@@ -14,3 +14,5 @@ namespaces:
   - "orch-secret"
   - "orch-gateway"
   - "orch-iam"
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/rs-proxy.yaml b/argocd/applications/configs/rs-proxy.yaml
@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 refreshInterval: "10m"
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/sre-exporter.yaml b/argocd/applications/configs/sre-exporter.yaml
@@ -27,3 +27,5 @@ otelCollector:
 configReloader:
   o11yTenantController:
     namespace: orch-platform
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/configs/token-refresh.yaml b/argocd/applications/configs/token-refresh.yaml
@@ -5,3 +5,5 @@
 refreshInterval: "5m"
 authEndpoint: "https://login.microsoftonline.com"
 authPath: "/organizations/oauth2/v2.0/token"
+
+externalSecretsApiGroup: external-secrets.io/v1
diff --git a/argocd/applications/templates/aws-sm-get-rs-token.yaml b/argocd/applications/templates/aws-sm-get-rs-token.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid rsChartRepoURL entry required!" .Values.argo.rsChartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 0.3.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml b/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml b/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml b/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml b/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml b/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml b/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml b/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml b/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml b/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/copy-rs-token-to-cluster.yaml b/argocd/applications/templates/copy-rs-token-to-cluster.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/external-secrets.yaml b/argocd/applications/templates/external-secrets.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: https://charts.external-secrets.io
       chart: external-secrets
-      targetRevision: 0.9.11
+      targetRevision: 0.20.4
       helm:
         releaseName: {{$appName}}
         valuesObject:
@@ -49,4 +49,5 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true # See https://github.com/argoproj/argo-cd/issues/820
 {{- end }}
diff --git a/argocd/applications/templates/fleet-rs-secret.yaml b/argocd/applications/templates/fleet-rs-secret.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 2.0.4
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/oci-secret.yaml b/argocd/applications/templates/oci-secret.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid rsChartRepoURL entry required!" .Values.argo.rsChartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 2.0.3
+      targetRevision: 25.2.1
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/rs-image-pull-secrets.yaml b/argocd/applications/templates/rs-image-pull-secrets.yaml
@@ -22,7 +22,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$chartName}}
-      targetRevision: 1.0.1
+      targetRevision: 25.2.2
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/rs-proxy.yaml b/argocd/applications/templates/rs-proxy.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 25.2.2
+      targetRevision: 25.2.3
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/sre-exporter.yaml b/argocd/applications/templates/sre-exporter.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: o11y/charts/{{$appName}}
-      targetRevision: 0.9.2-dev
+      targetRevision: 0.9.2
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/token-refresh.yaml b/argocd/applications/templates/token-refresh.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid rsChartRepoURL entry required!" .Values.argo.rsChartRepoURL }}
       chart: common/charts/{{$appName}}
-      targetRevision: 25.2.2
+      targetRevision: 25.2.3
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/mage/deploy.go b/mage/deploy.go
@@ -558,7 +558,7 @@ func kindCluster(name string, targetEnv string) error {
 
 	//nolint: lll
 	kindTemplate := template.Must(template.New("kind-cluster").
-		Parse(`kind create cluster --name {{ .Name }} --image kindest/node:v1.30.3 --config - <<EOF
+		Parse(`kind create cluster --name {{ .Name }} --image kindest/node:v1.33.4 --config - <<EOF
     kind: Cluster
     apiVersion: kind.x-k8s.io/v1alpha4
     networking:

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: Apache-2.0`
`4`	`4`
`5`		`-# Intentionally left blank`
	`5`	`+# Intentionally left blank`