Repository: kubernetes-sigs/security-profiles-operator
Pull request #2196 (2024-04-08 11:06:22)

Back to dev

#### What type of PR is this?


/kind cleanup


#### What this PR does / why we need it:
Moving back to the next development version.
#### Which issue(s) this PR fixes:

<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.

Fixes #

or

None
-->
Refers to https://github.com/kubernetes-sigs/security-profiles-operator/issues/2194
#### Does this PR have test?
None
<!--
If tests aren't applicable just write N/A.
-->

#### Special notes for your reviewer:
None
#### Does this PR introduce a user-facing change?

<!--
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".

For more information on release notes see: https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
None
```


k8s-ci-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/2196#" title="Author self-approved">saschagrunert</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fsecurity-profiles-operator).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubernetes-sigs/security-profiles-operator/blob/main/OWNERS)~~ [saschagrunert]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
k8s-ci-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/2196#pullrequestreview-1986111315" title="Approved">JAORMX</a>*, *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/2196#" title="Author self-approved">saschagrunert</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fsecurity-profiles-operator).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubernetes-sigs/security-profiles-operator/blob/main/OWNERS)~~ [JAORMX,saschagrunert]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->

Patch:
diff --git a/VERSION b/VERSION
index ee94dd834..dd59a8203 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-0.8.3
+0.8.4-dev
diff --git a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
index f0d07a2fb..26576f63f 100644
--- a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
@@ -242,14 +242,14 @@ metadata:
     capabilities: Basic Install
     categories: Security
     containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
-    olm.skipRange: '>=0.4.1 <0.8.3'
+    olm.skipRange: '>=0.4.1 <0.8.4-dev'
     operatorframework.io/cluster-monitoring: "true"
     operatorframework.io/suggested-namespace: security-profiles-operator
     operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
       Container Platform", "OpenShift Platform Plus"]'
     operators.operatorframework.io/builder: operator-sdk-v1.25.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: security-profiles-operator.v0.8.3
+  name: security-profiles-operator.v0.8.4-dev
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -874,7 +874,7 @@ spec:
                       fieldPath: spec.nodeName
                 - name: KUBELET_DIR
                   value: /var/lib/kubelet
-                image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+                image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
                 imagePullPolicy: Always
                 name: security-profiles-operator
                 resources:
@@ -986,4 +986,4 @@ spec:
   - image: quay.io/security-profiles-operator/selinuxd-el9:latest
     name: selinuxd-el9
   replaces: security-profiles-operator.v0.8.2
-  version: 0.8.3
+  version: 0.8.4-dev
diff --git a/dependencies.yaml b/dependencies.yaml
index 3734e002c..82ae98f5c 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -184,7 +184,7 @@ dependencies:
       match: BOM_VERSION
 
   - name: spo-current
-    version: 0.8.3
+    version: 0.8.4-dev
     refPaths:
     - path: VERSION
       match: ^.*
diff --git a/deploy/catalog-preamble.json b/deploy/catalog-preamble.json
index 9bbf449dd..5424c5cee 100644
--- a/deploy/catalog-preamble.json
+++ b/deploy/catalog-preamble.json
@@ -13,8 +13,8 @@
     "package": "security-profiles-operator",
     "entries": [
         {
-            "name": "security-profiles-operator.v0.8.3",
-            "skipRange": ">=0.4.1 <0.8.3"
+            "name": "security-profiles-operator.v0.8.4-dev",
+            "skipRange": ">=0.4.1 <0.8.4-dev"
         }
     ]
 }
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 19f198785..f6d10b0ae 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: security-profiles-operator
 description: "The Kubernetes Security Profiles Operator."
 type: application
-version: "0.8.3"
-appVersion: "0.8.3"
+version: "0.8.4-dev"
+appVersion: "0.8.4-dev"
diff --git a/deploy/kustomize-deployment/kustomization.yaml b/deploy/kustomize-deployment/kustomization.yaml
index d7421c802..672f32a68 100644
--- a/deploy/kustomize-deployment/kustomization.yaml
+++ b/deploy/kustomize-deployment/kustomization.yaml
@@ -3,11 +3,11 @@ kind: Kustomization
 
 images:
 - name: security-profiles-operator
-  # newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
-  # newTag: latest
+  newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
+  newTag: latest
   # For images to be released:
-  newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
-  newTag: v0.8.3
+  # newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
+  # newTag: v0.8.4
 
 
 resources:
diff --git a/deploy/namespace-operator.yaml b/deploy/namespace-operator.yaml
index 85d095eff..ed6225006 100644
--- a/deploy/namespace-operator.yaml
+++ b/deploy/namespace-operator.yaml
@@ -3199,7 +3199,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/deploy/openshift-dev.yaml b/deploy/openshift-dev.yaml
index 84c6d202b..b3cfb0767 100644
--- a/deploy/openshift-dev.yaml
+++ b/deploy/openshift-dev.yaml
@@ -3190,7 +3190,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+        image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/deploy/openshift-downstream.yaml b/deploy/openshift-downstream.yaml
index 87ee12586..a095c1d4a 100644
--- a/deploy/openshift-downstream.yaml
+++ b/deploy/openshift-downstream.yaml
@@ -3210,7 +3210,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index c17966a24..55aacf77b 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -3197,7 +3197,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/deploy/webhook-operator.yaml b/deploy/webhook-operator.yaml
index a5f824020..2bbce781c 100644
--- a/deploy/webhook-operator.yaml
+++ b/deploy/webhook-operator.yaml
@@ -3197,7 +3197,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/examples/olm/install-resources.yaml b/examples/olm/install-resources.yaml
index 7f2d83b2c..fd2c49734 100644
--- a/examples/olm/install-resources.yaml
+++ b/examples/olm/install-resources.yaml
@@ -17,7 +17,7 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.8.3
+  image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
diff --git a/hack/deploy-localhost.patch b/hack/deploy-localhost.patch
index 6f1c2a799..5e6bbf305 100644
--- a/hack/deploy-localhost.patch
+++ b/hack/deploy-localhost.patch
@@ -15,7 +15,7 @@ index d7bf1964..d2a9c614 100644
                fieldPath: spec.nodeName
          - name: KUBELET_DIR
            value: /var/lib/kubelet
--        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.3
+-        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
 -        imagePullPolicy: Always
 +        image: localhost/security-profiles-operator:latest
 +        imagePullPolicy: IfNotPresent


Test patch:
diff --git a/hack/ci/e2e-olm.sh b/hack/ci/e2e-olm.sh
index 69f5ab3cf..683d59536 100755
--- a/hack/ci/e2e-olm.sh
+++ b/hack/ci/e2e-olm.sh
@@ -45,7 +45,7 @@ function build_and_push_packages() {
 
     # Create a manifest with local image
     cp deploy/operator.yaml ${OPERATOR_MANIFEST}
-    sed -i "s#registry.k8s.io/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
+    sed -i "s#gcr.io/k8s-staging-sp-operator/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
     grep ${IMG} ${OPERATOR_MANIFEST} || exit 1
 
     # this is a kludge, we need to make sure kustomize can be overwritten
@@ -73,7 +73,7 @@ function deploy_deps() {
     kubectl_wait -ncert-manager --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
 
     # All installation methods run off the same catalog
-    sed -i "s#registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.8.3#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
+    sed -i "s#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
 
 }
 
diff --git a/test/e2e_test.go b/test/e2e_test.go
index 043eb4701..16ce65649 100644
--- a/test/e2e_test.go
+++ b/test/e2e_test.go
@@ -311,8 +311,8 @@ func (e *e2e) deployOperator(manifest string) {
 	// ones from the nodes
 	e.logf("Setting imagePullPolicy to '%s' in manifest: %s", e.pullPolicy, manifest)
 	e.updateManifest(manifest, "imagePullPolicy: Always", fmt.Sprintf("imagePullPolicy: %s", e.pullPolicy))
-	e.updateManifest(manifest, "image: .*registry.k8s.io/.*", fmt.Sprintf("image: %s", e.testImage))
-	e.updateManifest(manifest, "value: .*registry.k8s.io/.*", fmt.Sprintf("value: %s", e.testImage))
+	e.updateManifest(manifest, "image: .*gcr.io/k8s-staging-sp-operator/.*", fmt.Sprintf("image: %s", e.testImage))
+	e.updateManifest(manifest, "value: .*gcr.io/k8s-staging-sp-operator/.*", fmt.Sprintf("value: %s", e.testImage))
 	if e.selinuxEnabled {
 		e.updateManifest(manifest, "enableSelinux: false", "enableSelinux: true")
 	}