NE-2076: Update ExternalDNS Operator to version 1.3.1

Containerfile.external-dns-operator

@@ -29,7 +29,7 @@ FROM registry.access.redhat.com/ubi9/ubi:9.6-1751287003
 LABEL maintainer="Red Hat, Inc."
 LABEL com.redhat.component="external-dns-operator-container"
 LABEL name="external-dns-operator"
-LABEL version="1.3.0"
+LABEL version="1.3.1"
 WORKDIR /
 COPY --from=builder /workspace/bin/external-dns-operator /
 # Red Hat certified container images have licenses.

Containerfile.external-dns-operator-bundle

@@ -39,7 +39,7 @@ LABEL com.redhat.delivery.backport: false
 LABEL com.redhat.delivery.operator.bundle: true
 
 LABEL name=external-dns-operator-bundle
-LABEL version="1.3.0"
+LABEL version="1.3.1"
 LABEL maintainer='NetworkEdge team <[email protected]>'
 LABEL io.k8s.display-name='ExternalDNS Operator'
 LABEL io.k8s.description='Operator bundle for the ExternalDNS Operator'

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
-BUNDLE_VERSION ?= 1.3.0
+BUNDLE_VERSION ?= $(shell cat VERSION)
 
 # 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")
@@ -134,6 +134,7 @@ verify: lint
 	hack/verify-deps.sh
 	hack/verify-generated.sh
 	hack/verify-olm.sh
+	hack/verify-version.sh
 
 ##@ Build
 GO=GO111MODULE=on GOFLAGS=-mod=vendor CGO_ENABLED=0 go
@@ -179,6 +180,8 @@ bundle: $(OPERATOR_SDK_BIN) manifests
 	$(OPERATOR_SDK_BIN) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image quay.io/openshift/origin-external-dns-operator=$(IMG)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK_BIN) generate bundle -q --overwrite=false --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+	@# Generate skipRange from BUNDLE_VERSION
+	sed -i "s/\(olm\.skipRange: <\).*/\1$(BUNDLE_VERSION)/" bundle/manifests/external-dns-operator.clusterserviceversion.yaml
 	$(OPERATOR_SDK_BIN) bundle validate $(BUNDLE_DIR)
 
 .PHONY: set-version

VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

bundle/manifests/external-dns-operator.clusterserviceversion.yaml

@@ -338,15 +338,15 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: <1.3.0
+    olm.skipRange: <1.3.1
     operatorframework.io/suggested-namespace: external-dns-operator
     operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
       Container Platform", "OpenShift Platform Plus"]'
     operators.operatorframework.io/builder: operator-sdk-v1.16.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/external-dns-operator
     support: Red Hat, Inc.
-  name: external-dns-operator.v1.3.0
+  name: external-dns-operator.v1.3.1
   namespace: external-dns-operator
 spec:
   apiservicedefinitions: {}
@@ -627,7 +627,7 @@ spec:
   minKubeVersion: 1.22.0
   provider:
     name: Red Hat, Inc.
-  version: 1.3.0
+  version: 1.3.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

hack/sync-version.sh

@@ -47,7 +47,8 @@ for containerfile in "${containerfiles[@]}"; do
         echo "[OK] $(basename "$containerfile"): already in sync ($version)"
     else
         echo "[UPDATE] $(basename "$containerfile"): updating from $current_version to $version"
-        exit 1
+        sed -i "s/version=\"[^\"]*\"/version=\"$version\"/" "$containerfile"
+        any_updated=true
     fi
 done
 

hack/verify-version.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euo pipefail
+
+function print_failure {
+  git status
+  git diff
+  echo "There are unexpected changes to the tree when running 'make set-version'. Please"
+  echo "run the command locally and double-check the Git repository for unexpected changes which may"
+  echo "need to be committed."
+  exit 1
+}
+
+if [ "${OPENSHIFT_CI:-false}" = true ]; then
+  echo "> setting version"
+  make set-version
+  test -z "$(git status --porcelain | \grep -v '^??')" || print_failure
+  echo "> verified containerfiles"
+fi