Back to dev

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2-dev

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.1
-    olm.skipRange: '>=0.4.1 <0.8.1'
+    olm.skipRange: '>=0.4.1 <0.8.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.8.1
+  name: security-profiles-operator.v0.8.2-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.1
+                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.0
-  version: 0.8.1
+  version: 0.8.2-dev

dependencies.yaml

@@ -188,7 +188,7 @@ dependencies:
       match: BOM_VERSION
 
   - name: spo-current
-    version: 0.8.1
+    version: 0.8.2-dev
     refPaths:
     - path: VERSION
       match: ^.*

deploy/catalog-preamble.json

@@ -13,8 +13,8 @@
     "package": "security-profiles-operator",
     "entries": [
         {
-            "name": "security-profiles-operator.v0.8.1",
-            "skipRange": ">=0.4.1 <0.8.1"
+            "name": "security-profiles-operator.v0.8.2-dev",
+            "skipRange": ">=0.4.1 <0.8.2-dev"
         }
     ]
 }

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.1"
-appVersion: "0.8.1"
+version: "0.8.2-dev"
+appVersion: "0.8.2-dev"

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.1
+  # newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
+  # newTag: v0.8.2
 
 
 resources:

deploy/namespace-operator.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.1
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

deploy/openshift-dev.yaml

@@ -3201,7 +3201,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.1
+        image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

deploy/openshift-downstream.yaml

@@ -3221,7 +3221,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.1
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

deploy/operator.yaml

@@ -3208,7 +3208,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.1
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

deploy/webhook-operator.yaml

@@ -3208,7 +3208,7 @@ spec:
               fieldPath: spec.nodeName
         - name: KUBELET_DIR
           value: /var/lib/kubelet
-        image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.1
+        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

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.1
+  image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription

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.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
 
 }
 

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.1
+-        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
 -        imagePullPolicy: Always
 +        image: localhost/security-profiles-operator:latest
 +        imagePullPolicy: IfNotPresent

nix/derivation-bpf.nix

@@ -2,7 +2,7 @@
 with pkgs; buildGo121Module rec {
   name = "security-profiles-operator";
   src = ./..;
-  vendorSha256 = null;
+  vendorHash = null;
   doCheck = false;
   outputs = [ "out" ];
   nativeBuildInputs = with buildPackages; [

nix/derivation.nix

@@ -2,7 +2,7 @@
 with pkgs; buildGo121Module rec {
   name = "security-profiles-operator";
   src = ./..;
-  vendorSha256 = null;
+  vendorHash = null;
   doCheck = false;
   outputs = [ "out" ];
   nativeBuildInputs = with buildPackages; [

release.md

@@ -55,12 +55,9 @@ To run the tool from `$GOPATH/src/sigs.k8s.io/promo-tools`, just execute:
 
 ```bash
 > export GITHUB_TOKEN=<YOUR_TOKEN>
-> go run ./cmd/kpromo pr \
+> kpromo pr \
     --fork <YOUR_GH_USERNAME> \
     --project sp-operator \
-    --reviewers "" \
-    --image "" \
-    --digests "" \
     --tag v0.x.y
 ```
 
@@ -71,6 +68,9 @@ directly on GitHub and add the release notes. The release notes can be generated
 by the [official Kubernetes Release Notes
 tool](https://github.com/kubernetes/release/tree/master/cmd/release-notes).
 
+Run `make nix-spoc` and attach the results from the `build` directory to the
+GitHub release.
+
 After that, another PR against this repository has to be created, which:
 
 - bumps the [`VERSION`](VERSION) file to the next minor version, but now including the
@@ -82,6 +82,9 @@ After that, another PR against this repository has to be created, which:
 - changes the tag in the same way in the OLM example manifest at
   [./examples/olm/install-resources.yaml](/examples/olm/install-resources.yaml)
 - reverts the changes to [`hack/ci/e2e-olm.sh`](/hack/ci/e2e-olm.sh)
+- reverts the changes to [`deploy/helm/Chart.yaml`](/deploy/helm/Chart.yaml)
+- reverts the changes to [`hack/deploy-localhost.patch`](/hack/deploy-localhost.patch)
+- reverts the changes to [`test/e2e_test.go`](/test/e2e_test.go)
 - updates [./dependencies.yaml](./dependencies.yaml) `spo-current` version as
   well as its linked files. Run `make verify-dependencies` to verify the
   results.

test/e2e_test.go

@@ -306,8 +306,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")