Repository: kubernetes-sigs/security-profiles-operator
Pull request #1317 (2022-11-21 12:42:13)

Back to v0.6.1-dev


#### What type of PR is this?

/kind cleanup


#### What this PR does / why we need it:
Bumping the versions back to dev.
#### 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 #1308 
#### 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/1317#" 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":[]} -->
saschagrunert: @JAORMX @jhrozek @pjbgf @Vincent056 @ccojocar PTAL
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/1317#pullrequestreview-1188891009" title="LGTM">pjbgf</a>*, *<a href="https://github.com/kubernetes-sigs/security-profiles-operator/pull/1317#" 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)~~ [pjbgf,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 a918a2aa1..2feed2fef 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-0.6.0
+0.6.1-dev
diff --git a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
index 4804a84af..94800dd5b 100644
--- a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
@@ -98,13 +98,13 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Security
-    olm.skipRange: '>=0.4.1 <0.6.0'
+    olm.skipRange: '>=0.4.1 <0.6.1-dev'
     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.6.0
+  name: security-profiles-operator.v0.6.1-dev
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -440,7 +440,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: spec.nodeName
-                image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.6.0
+                image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
                 imagePullPolicy: Always
                 name: security-profiles-operator
                 resources:
@@ -514,4 +514,4 @@ spec:
     name: rbac-proxy
   - image: quay.io/security-profiles-operator/selinuxd
     name: selinuxd
-  version: 0.6.0
+  version: 0.6.1-dev
diff --git a/dependencies.yaml b/dependencies.yaml
index 215272b74..c6d685e54 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -164,7 +164,7 @@ dependencies:
       match: BOM_VERSION
 
   - name: spo-current
-    version: 0.6.0
+    version: 0.6.1-dev
     refPaths:
     - path: VERSION
       match: ^.*
diff --git a/deploy/catalog-preamble.json b/deploy/catalog-preamble.json
index 7cc280ef4..04a4e3a1c 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.6.0",
-            "skipRange": ">=0.4.1 <0.6.0"
+            "name": "security-profiles-operator.v0.6.1-dev",
+            "skipRange": ">=0.4.1 <0.6.1-dev"
         }
     ]
 }
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 2ae9ecd97..fffdd6574 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.6.0"
-appVersion: "0.6.0"
+version: "0.6.1-dev"
+appVersion: "0.6.1-dev"
diff --git a/deploy/kustomize-deployment/kustomization.yaml b/deploy/kustomize-deployment/kustomization.yaml
index 961352e67..abd02e4a6 100644
--- a/deploy/kustomize-deployment/kustomization.yaml
+++ b/deploy/kustomize-deployment/kustomization.yaml
@@ -4,11 +4,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.6.0
+    # newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
+    # newTag: v0.6.1
 
 commonLabels:
   app: security-profiles-operator
diff --git a/deploy/namespace-operator.yaml b/deploy/namespace-operator.yaml
index 79fc74ac6..5e599683e 100644
--- a/deploy/namespace-operator.yaml
+++ b/deploy/namespace-operator.yaml
@@ -2967,7 +2967,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.6.0
+        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 3d70bf3ec..46561ec81 100644
--- a/deploy/openshift-dev.yaml
+++ b/deploy/openshift-dev.yaml
@@ -2965,7 +2965,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.6.0
+        image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index 3d70bf3ec..89e32660d 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -2965,7 +2965,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.6.0
+        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 717249616..a2a4bdaee 100644
--- a/deploy/webhook-operator.yaml
+++ b/deploy/webhook-operator.yaml
@@ -2965,7 +2965,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.6.0
+        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 4b2d2f69b..c75a455d8 100644
--- a/examples/olm/install-resources.yaml
+++ b/examples/olm/install-resources.yaml
@@ -14,7 +14,7 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.6.0
+  image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
diff --git a/installation-usage.md b/installation-usage.md
index a9e4ce664..9ba2d9162 100644
--- a/installation-usage.md
+++ b/installation-usage.md
@@ -164,7 +164,7 @@ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/
 kubectl --namespace cert-manager wait --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
 # Install the chart from a release URL (note: helm also allows users to
 # specify a file path instead of a URL, if desired):
-helm install security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.6.0/security-profiles-operator-0.6.0.tgz
+helm install security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.6.1-dev/security-profiles-operator-0.6.1-dev.tgz
 ```
 
 ### Installation on AKS


Test patch:
diff --git a/hack/ci/e2e-olm.sh b/hack/ci/e2e-olm.sh
index a710579cc..cbd1bb13d 100755
--- a/hack/ci/e2e-olm.sh
+++ b/hack/ci/e2e-olm.sh
@@ -60,7 +60,7 @@ function deploy_spo() {
     kubectl -ncert-manager wait --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
 
     # let's roll..
-    sed -i "s#registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.6.0#${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
     kubectl create -f examples/olm/install-resources.yaml
 }
 
diff --git a/test/e2e_test.go b/test/e2e_test.go
index c3c174dd5..498abc50b 100644
--- a/test/e2e_test.go
+++ b/test/e2e_test.go
@@ -281,8 +281,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/.*", fmt.Sprintf("image: %s", e.testImage))
+	e.updateManifest(manifest, "value: .*gcr.io/.*", 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")