Merge pull request #152 from siddhibhor-56/eso-448

ESO-448: Upstream bump for v1.2.0 and rebase release version to v2.6.0

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: builder
   namespace: ocp
-  tag: rhel-9-golang-1.25-openshift-4.21
+  tag: rhel-9-golang-1.26-openshift-4.23

Dockerfile

@@ -1,5 +1,5 @@
 # Build the external-secrets-operator binary
-FROM docker.io/golang:1.25 AS builder
+FROM docker.io/golang:1.26 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -16,17 +16,17 @@ export XDG_CONFIG_HOME ?= $(PROJECT_ROOT)/_output/.config
 
 # IMG_VERSION defines the images version for the operator, bundle and catalog (must be valid semver: Major.Minor.Patch).
 # To re-generate any image for another specific version without changing the standard setup, you can:
-# - use the IMG_VERSION as arg of the specific image build and push targets (e.g make IMG_VERSION=1.1.0 bundle-build bundle-push)
-# - use environment variables to overwrite this value (e.g export IMG_VERSION=1.1.0)
-IMG_VERSION ?= 1.1.0
+# - use the IMG_VERSION as arg of the specific image build and push targets (e.g make IMG_VERSION=1.2.0 bundle-build bundle-push)
+# - use environment variables to overwrite this value (e.g export IMG_VERSION=1.2.0)
+IMG_VERSION ?= 1.2.0
 
 # Validate IMG_VERSION is valid semver (Major.Minor.Patch), fallback to default if not.
 ifneq ($(shell echo '$(IMG_VERSION)' | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$$' && echo valid),valid)
 $(error IMG_VERSION '$(IMG_VERSION)' is not valid semver (expected: Major.Minor.Patch))
 endif
 
 # EXTERNAL_SECRETS_VERSION defines the external-secrets release version to fetch helm charts.
-EXTERNAL_SECRETS_VERSION ?= v0.20.4
+EXTERNAL_SECRETS_VERSION ?= v2.6.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -73,7 +73,7 @@ endif
 
 # IMG is the image URL used for building/pushing image targets.
 # Default tag is 'latest' to avoid unnecessary changes in checked-in manifests.
-# Override with a specific version when building release images (e.g., IMG=openshift.io/external-secrets-operator:v1.1.0).
+# Override with a specific version when building release images (e.g., IMG=openshift.io/external-secrets-operator:v1.2.0).
 IMG ?= openshift.io/external-secrets-operator:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -99,7 +99,7 @@ GO_PACKAGE ?= github.com/openshift/external-secrets-operator
 SOURCE_GIT_COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null)
 BUILD_DATE ?= $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 
-# Extract major/minor from IMG_VERSION (e.g., 1.1.0 -> major=1, minor=1)
+# Extract major/minor from IMG_VERSION (e.g., 1.2.0 -> major=1, minor=1)
 IMG_VERSION_MAJOR = $(word 1,$(subst ., ,$(IMG_VERSION)))
 IMG_VERSION_MINOR = $(word 2,$(subst ., ,$(IMG_VERSION)))
 

bindata/external-secrets/networkpolicy_allow-api-server-and-webhook-traffic.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets-webhook
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
     external-secrets.io/component: webhook
 spec:

bindata/external-secrets/networkpolicy_allow-api-server-egress-for-bitwarden-sever.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: bitwarden-sdk-server
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
 spec:
   podSelector:

bindata/external-secrets/networkpolicy_allow-api-server-egress-for-cert-controller-traffic.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets-cert-controller
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
 spec:
   podSelector:

bindata/external-secrets/networkpolicy_allow-api-server-egress-for-main-controller-traffic.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
 spec:
   podSelector:

bindata/external-secrets/networkpolicy_allow-dns.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
   name: eso-sys-allow-to-dns
 spec:

bindata/external-secrets/networkpolicy_deny-all.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v1.1.0"
+    app.kubernetes.io/version: "v1.2.0"
     app.kubernetes.io/managed-by: external-secrets-operator
 spec:
   podSelector: {}

bindata/external-secrets/resources/certificate_external-secrets-webhook.yml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: external-secrets-webhook
     app.kubernetes.io/instance: external-secrets
-    app.kubernetes.io/version: "v0.20.4"
+    app.kubernetes.io/version: "v2.6.0"
     app.kubernetes.io/managed-by: external-secrets-operator
     external-secrets.io/component: webhook
 spec:
@@ -20,5 +20,5 @@ spec:
     group: cert-manager.io
     kind: Issuer
     name: my-issuer
-  duration: "8760h"
+  duration: "8760h0m0s"
   secretName: external-secrets-webhook