Repository: kubernetes-sigs/security-profiles-operator
Pull request #1575 (2023-03-27 07:44:14)

Back to dev


#### What type of PR is this?


/kind documentation


#### What this PR does / why we need it:
Moving back to dev after the release.
/hold
#### 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
-->
Part of #1574 
#### Does this PR have test?

<!--
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/1575#" 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":[]} -->
codecov-commenter: ## [Codecov](https://codecov.io/gh/kubernetes-sigs/security-profiles-operator/pull/1575?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kubernetes-sigs) Report
> Merging [#1575](https://codecov.io/gh/kubernetes-sigs/security-profiles-operator/pull/1575?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kubernetes-sigs) (3d1451e) into [main](https://codecov.io/gh/kubernetes-sigs/security-profiles-operator/commit/b101bf3d9c714adf2a569b4ca81635e8efc7efe3?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kubernetes-sigs) (b101bf3) will **decrease** coverage by `0.06%`.
> The diff coverage is `n/a`.

> :exclamation: Current head 3d1451e differs from pull request most recent head 0983fce. Consider uploading reports for the commit 0983fce to get more accurate results

<details><summary>Additional details and impacted files</summary>


```diff
@@            Coverage Diff             @@
##             main    #1575      +/-   ##
==========================================
- Coverage   48.56%   48.50%   -0.06%     
==========================================
  Files          68       68              
  Lines        6680     6680              
==========================================
- Hits         3244     3240       -4     
- Misses       3311     3314       +3     
- Partials      125      126       +1     
```

</details>
saschagrunert: /unhold
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/1575#pullrequestreview-1358887547" title="Approved">JAORMX</a>*, *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/1575#" 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 39e898a4f..c7d252271 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-0.7.1
+0.7.2-dev
diff --git a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
index 40d7c0b9e..c1ea62d22 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.7.1
-    olm.skipRange: '>=0.4.1 <0.7.1'
+    olm.skipRange: '>=0.4.1 <0.7.2-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.7.1
+  name: security-profiles-operator.v0.7.2-dev
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -862,7 +862,7 @@ spec:
                       fieldPath: spec.nodeName
                 - name: KUBELET_DIR
                   value: /var/lib/kubelet
-                image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+                image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
                 imagePullPolicy: Always
                 name: security-profiles-operator
                 resources:
@@ -969,4 +969,4 @@ spec:
   - image: quay.io/security-profiles-operator/selinuxd
     name: selinuxd
   replaces: security-profiles-operator.v0.7.0
-  version: 0.7.1
+  version: 0.7.2-dev
diff --git a/dependencies.yaml b/dependencies.yaml
index 35698cf28..cf5832823 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -206,7 +206,7 @@ dependencies:
       match: BOM_VERSION
 
   - name: spo-current
-    version: 0.7.1
+    version: 0.7.2-dev
     refPaths:
     - path: VERSION
       match: ^.*
@@ -216,8 +216,6 @@ dependencies:
       match: "^appVersion: "
     - path: deploy/helm/Chart.yaml
       match: "^version: "
-    - path: installation-usage.md
-      match: ^helm install security-profiles-operator
 
   - name: clang
     version: 15
diff --git a/deploy/catalog-preamble.json b/deploy/catalog-preamble.json
index b2ab450ef..4cec5139c 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.7.1",
-            "skipRange": ">=0.4.1 <0.7.1"
+            "name": "security-profiles-operator.v0.7.2-dev",
+            "skipRange": ">=0.4.1 <0.7.2-dev"
         }
     ]
 }
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 693357da4..f8b6491d6 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.7.1"
-appVersion: "0.7.1"
+version: "0.7.2-dev"
+appVersion: "0.7.2-dev"
diff --git a/deploy/kustomize-deployment/kustomization.yaml b/deploy/kustomize-deployment/kustomization.yaml
index 0957f8dba..e1a0e1f41 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.7.1
+  # newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
+  # newTag: v0.7.2
 
 
 resources:
diff --git a/deploy/namespace-operator.yaml b/deploy/namespace-operator.yaml
index 8f6a8fcc8..5f9df1d45 100644
--- a/deploy/namespace-operator.yaml
+++ b/deploy/namespace-operator.yaml
@@ -3008,7 +3008,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+        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 3d4641c10..8ed8bf9af 100644
--- a/deploy/openshift-dev.yaml
+++ b/deploy/openshift-dev.yaml
@@ -2999,7 +2999,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+        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 60fde8552..5d7b0f4ad 100644
--- a/deploy/openshift-downstream.yaml
+++ b/deploy/openshift-downstream.yaml
@@ -3019,7 +3019,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+        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 f2faa1110..92d0a7a57 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -3006,7 +3006,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+        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 3fa5e981c..3d71414a3 100644
--- a/deploy/webhook-operator.yaml
+++ b/deploy/webhook-operator.yaml
@@ -3006,7 +3006,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1
+        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 d9a43dbf6..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.7.1
+  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 c4738dbb4..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.7.1
+-        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 8c5f15135..483faf2a7 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 -ncert-manager wait --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.7.1#${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 83753ee99..526f47728 100644
--- a/test/e2e_test.go
+++ b/test/e2e_test.go
@@ -289,8 +289,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))
 	e.updateManifest(manifest, "value: .*quay.io/.*/selinuxd.*", fmt.Sprintf("value: %s", e.selinuxdImage))
 	if e.selinuxEnabled {
 		e.updateManifest(manifest, "enableSelinux: false", "enableSelinux: true")