Merge pull request #321 from bharath-b-rh/cm-639-2

CM-639: Updates index-image-build Makefile target command

Author: openshift-merge-bot[bot]

Makefile

@@ -163,7 +163,7 @@ verify-scripts:
 .PHONY: verify-scripts
 
 .PHONY: verify
-verify: verify-scripts
+verify: verify-scripts fmt
 
 .PHONY: verify-with-container
 verify-with-container:
@@ -252,7 +252,7 @@ bundle-image-push: check-tools
 
 .PHONY: index-image-build
 index-image-build: check-tools opm
-	$(OPM) index add -c $(CONTAINER_ENGINE) --bundles ${BUNDLE_IMG} --tag ${INDEX_IMG}
+	$(OPM) index add --container-tool $(CONTAINER_ENGINE) --mode semver --tag $(INDEX_IMG) --bundles $(BUNDLE_IMG)
 
 .PHONY: index-image-push
 index-image-push: check-tools

bundle/manifests/cert-manager-operator.clusterserviceversion.yaml

@@ -698,11 +698,11 @@ spec:
                 - name: OPERATOR_NAME
                   value: cert-manager-operator
                 - name: RELATED_IMAGE_CERT_MANAGER_WEBHOOK
-                  value: quay.io/jetstack/cert-manager-webhook:latest
+                  value: quay.io/jetstack/cert-manager-webhook:v1.18.3
                 - name: RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR
-                  value: quay.io/jetstack/cert-manager-cainjector:latest
+                  value: quay.io/jetstack/cert-manager-cainjector:v1.18.3
                 - name: RELATED_IMAGE_CERT_MANAGER_CONTROLLER
-                  value: quay.io/jetstack/cert-manager-controller:latest
+                  value: quay.io/jetstack/cert-manager-controller:v1.18.3
                 - name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
                   value: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
                 - name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR
@@ -814,11 +814,11 @@ spec:
   provider:
     name: Red Hat
   relatedImages:
-  - image: quay.io/jetstack/cert-manager-webhook:latest
+  - image: quay.io/jetstack/cert-manager-webhook:v1.18.3
     name: cert-manager-webhook
-  - image: quay.io/jetstack/cert-manager-cainjector:latest
+  - image: quay.io/jetstack/cert-manager-cainjector:v1.18.3
     name: cert-manager-ca-injector
-  - image: quay.io/jetstack/cert-manager-controller:latest
+  - image: quay.io/jetstack/cert-manager-controller:v1.18.3
     name: cert-manager-controller
   - image: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
     name: cert-manager-acmesolver

config/manager/manager.yaml

@@ -75,11 +75,11 @@ spec:
             - name: OPERATOR_NAME
               value: cert-manager-operator
             - name: RELATED_IMAGE_CERT_MANAGER_WEBHOOK
-              value: quay.io/jetstack/cert-manager-webhook:latest
+              value: quay.io/jetstack/cert-manager-webhook:v1.18.3
             - name: RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR
-              value: quay.io/jetstack/cert-manager-cainjector:latest
+              value: quay.io/jetstack/cert-manager-cainjector:v1.18.3
             - name: RELATED_IMAGE_CERT_MANAGER_CONTROLLER
-              value: quay.io/jetstack/cert-manager-controller:latest
+              value: quay.io/jetstack/cert-manager-controller:v1.18.3
             - name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
               value: quay.io/jetstack/cert-manager-acmesolver:v1.18.3
             - name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR