ROX-32346: Bump ESO to v1.2.1

Author: kovayur

deploy/charts/emailsender/templates/emailsender-secret.yaml

@@ -1,5 +1,5 @@
-{{- if and (.Capabilities.APIVersions.Has "external-secrets.io/v1beta1") .Values.createExternalSecrets }}
-apiVersion: external-secrets.io/v1beta1
+{{- if and (.Capabilities.APIVersions.Has "external-secrets.io/v1") .Values.createExternalSecrets }}
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: emailsender-db-secret

deploy/charts/fleetshard-sync/templates/secret.yaml

@@ -1,5 +1,5 @@
-{{- if and (.Capabilities.APIVersions.Has "external-secrets.io/v1beta1") .Values.createExternalSecrets }}
-apiVersion: external-secrets.io/v1beta1
+{{- if and (.Capabilities.APIVersions.Has "external-secrets.io/v1") .Values.createExternalSecrets }}
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: fleetshard-sync-ext-secret
@@ -29,7 +29,7 @@ spec:
 {{- with .Values.tenantImagePullSecret }}
 {{- if and .create .name }}
 ---
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: {{ .name }}

deploy/test/fleetshard_sync_chart_test.go

@@ -52,7 +52,7 @@ func renderTemplate(t *testing.T, values map[string]string, template string) str
 	}
 
 	extraHelmArgs := []string{
-		"--api-versions", "external-secrets.io/v1beta1",
+		"--api-versions", "external-secrets.io/v1",
 	}
 	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{template}, extraHelmArgs...)
 	return output

dev/env/defaults/00-defaults.env

@@ -14,14 +14,15 @@ export ENABLE_FM_PORT_FORWARDING_DEFAULT="false"
 export INSTALL_OPENSHIFT_ROUTER_DEFAULT="true"
 # In some openshift environments the router is already installed but not exposed by default.
 export EXPOSE_OPENSHIFT_ROUTER_DEFAULT="false"
-export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="true"
+export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="false"
 export INSTALL_VERTICAL_POD_AUTOSCALER_OLM_DEFAULT="false"
 export INSTALL_ARGOCD="true"
 export INSTALL_OPENSHIFT_GITOPS="false"
 export ARGOCD_NAMESPACE="argocd"
 export ARGOCD_TENANT_APP_TARGET_REVISION_DEFAULT="HEAD"
 export INSTALL_EXTERNAL_SECRETS_DEFAULT="true" # pragma: allowlist secret
-export EXTERNAL_SECRETS_VERSION_DEFAULT="v0.14.4" # pragma: allowlist secret
+export EXTERNAL_SECRETS_VERSION_DEFAULT="v1.2.1" # pragma: allowlist secret
+export INSTALL_EXTERNAL_DNS_DEFAULT="false"
 
 export ENABLE_EMAIL_SENDER_DEFAULT="false"
 export EMAIL_SENDER_IMAGE_DEFAULT=""

dev/env/defaults/cluster-type-crc/env

@@ -1,3 +1,6 @@
 export ENABLE_CENTRAL_EXTERNAL_DOMAIN="true"
 export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
 export AWS_AUTH_HELPER_DEFAULT="aws-saml"
+export INSTALL_EXTERNAL_DNS_DEFAULT="false"
+export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="false"
+export INSTALL_VERTICAL_POD_AUTOSCALER_OLM_DEFAULT="false"

dev/env/defaults/cluster-type-openshift/env

@@ -7,3 +7,4 @@ export ENABLE_EXTERNAL_CONFIG_DEFAULT="false"
 export INSTALL_ARGOCD="false"
 export INSTALL_OPENSHIFT_GITOPS="true"
 export ARGOCD_NAMESPACE="openshift-gitops"
+export INSTALL_EXTERNAL_DNS_DEFAULT="true"

dev/env/manifests/external-secrets/01-clustersecretstore.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ClusterSecretStore
 metadata:
   name: secrets-manager-secret-store

dev/env/scripts/bootstrap.sh

@@ -124,7 +124,7 @@ else
 fi
 apply "${MANIFESTS_DIR}/addons/acs-fleetshard"
 
-if is_openshift_cluster "$CLUSTER_TYPE"; then
+if [[ "$INSTALL_EXTERNAL_DNS" == "true" ]]; then
     log "Installing ExternalDNS for OpenShift"
     apply "${MANIFESTS_DIR}/external-dns-operator"
     wait_for_crd externaldnses.externaldns.olm.openshift.io
@@ -133,7 +133,7 @@ if is_openshift_cluster "$CLUSTER_TYPE"; then
     export EXTERNAL_DNS_NAME=${INFRASTRUCTURE_NAME}
     chamber exec e2e-external-dns -- apply "${MANIFESTS_DIR}/external-dns"
 else
-    log "Skipping installation of ExternalDNS (only installed on openshift)"
+    log "Skipping installation of ExternalDNS"
 fi
 
 if [[ "$CLUSTER_TYPE"  == "kind" ]]; then

dev/env/scripts/lib.sh

@@ -88,6 +88,7 @@ init() {
     export INSTALL_VERTICAL_POD_AUTOSCALER_OLM="${INSTALL_VERTICAL_POD_AUTOSCALER_OLM:-$INSTALL_VERTICAL_POD_AUTOSCALER_OLM_DEFAULT}"
     export INSTALL_EXTERNAL_SECRETS="${INSTALL_EXTERNAL_SECRETS:-$INSTALL_EXTERNAL_SECRETS_DEFAULT}"
     export EXTERNAL_SECRETS_VERSION="${EXTERNAL_SECRETS_VERSION:-$EXTERNAL_SECRETS_VERSION_DEFAULT}"
+    export INSTALL_EXTERNAL_DNS="${INSTALL_EXTERNAL_DNS:-$INSTALL_EXTERNAL_DNS_DEFAULT}"
     export OCM_SERVICE_CLIENT_ID=${OCM_SERVICE_CLIENT_ID:-$OCM_SERVICE_CLIENT_ID_DEFAULT}
     export OCM_SERVICE_CLIENT_SECRET=${OCM_SERVICE_CLIENT_SECRET:-$OCM_SERVICE_CLIENT_SECRET_DEFAULT}
     export OCM_SERVICE_TOKEN=${OCM_SERVICE_TOKEN:-$OCM_SERVICE_TOKEN_DEFAULT}
@@ -152,6 +153,7 @@ INSTALL_ARGOCD: ${INSTALL_ARGOCD}
 INSTALL_OPENSHIFT_GITOPS: ${INSTALL_OPENSHIFT_GITOPS}
 INSTALL_EXTERNAL_SECRETS: ${INSTALL_EXTERNAL_SECRETS}
 EXTERNAL_SECRETS_VERSION: ${EXTERNAL_SECRETS_VERSION}
+INSTALL_EXTERNAL_DNS: ${INSTALL_EXTERNAL_DNS}
 ARGOCD_NAMESPACE: ${ARGOCD_NAMESPACE}
 ARGOCD_TENANT_APP_TARGET_REVISION: ${ARGOCD_TENANT_APP_TARGET_REVISION}
 OCM_SERVICE_CLIENT_ID: ********