Bump to v0.5.0

Signed-off-by: Sascha Grunert <[email protected]>
kubernetes-sigs · Oct 18, 2022 · 9d77a69 · 9d77a69
1 parent 51bd04c
commit 9d77a69
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 30 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.4-dev
+0.5.0
diff --git a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
@@ -98,11 +98,11 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Security
-    olm.skipRange: '>=0.4.1 <0.4.4-dev'
+    olm.skipRange: '>=0.4.1 <0.5.0'
     operatorframework.io/suggested-namespace: security-profiles-operator
     operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: security-profiles-operator.v0.4.4-dev
+  name: security-profiles-operator.v0.5.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -425,7 +425,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
+                image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
                 imagePullPolicy: Always
                 name: security-profiles-operator
                 resources:
@@ -499,4 +499,4 @@ spec:
     name: rbac-proxy
   - image: quay.io/security-profiles-operator/selinuxd
     name: selinuxd
-  version: 0.4.4-dev
+  version: 0.5.0
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -172,7 +172,7 @@ dependencies:
       match: BOM_VERSION
 
   - name: spo-current
-    version: 0.4.4-dev
+    version: 0.5.0
     refPaths:
     - path: VERSION
       match: ^.*

diff --git 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.4.4-dev"
-appVersion: "0.4.4-dev"
+version: "0.5.0"
+appVersion: "0.5.0"
diff --git 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: k8s.gcr.io/security-profiles-operator/security-profiles-operator
-    # newTag: v0.4.4
+    newName: k8s.gcr.io/security-profiles-operator/security-profiles-operator
+    newTag: v0.5.0
 
 commonLabels:
   app: security-profiles-operator

diff --git a/deploy/namespace-operator.yaml b/deploy/namespace-operator.yaml
@@ -2922,7 +2922,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
+        image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

diff --git a/deploy/openshift-dev.yaml b/deploy/openshift-dev.yaml
@@ -2920,7 +2920,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
+        image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -2920,7 +2920,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
+        image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

diff --git a/deploy/webhook-operator.yaml b/deploy/webhook-operator.yaml
@@ -2920,7 +2920,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
+        image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
         imagePullPolicy: Always
         name: security-profiles-operator
         resources:

diff --git a/examples/olm/install-resources.yaml b/examples/olm/install-resources.yaml
@@ -14,7 +14,7 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
+  image: k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.5.0
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup

diff --git a/hack/ci/e2e-olm.sh b/hack/ci/e2e-olm.sh
@@ -31,10 +31,8 @@ function build_and_push_packages() {
     OPERATOR_MANIFEST=deploy/operator-ci.yaml
 
     # Create a manifest with local image
-    pushd deploy/base
-    kustomize edit set image security-profiles-operator=$IMG
-    popd
-    kustomize build --reorder=none deploy/overlays/cluster -o ${OPERATOR_MANIFEST}
+    cp deploy/operator.yaml ${OPERATOR_MANIFEST}
+    sed -i "s#k8s.gcr.io/security-profiles-operator/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
 
     # this is a kludge, we need to make sure kustomize can be overwritten
     rm -f build/kustomize
@@ -62,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#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
+    sed -i "s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.5.0#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
     kubectl create -f examples/olm/install-resources.yaml
 }
 

diff --git a/installation-usage.md b/installation-usage.md
@@ -158,7 +158,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.4.4-dev/security-profiles-operator-0.4.4-dev.tgz
+helm install security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.5.0/security-profiles-operator-0.5.0.tgz
 ```
 
 ### Installation on AKS

diff --git a/release.md b/release.md
@@ -13,17 +13,21 @@ The first PR targets this repository and:
 
 - bumps the [`VERSION`](VERSION) file to the target version
 - changes the `images` `newName`/`newTag` fields of
-  [./deploy/base/kustomization.yaml](deploy/base/kustomization.yaml) from
-  `gcr.io/k8s-staging-sp-operator/security-profiles-operator` to
+  [./deploy/kustomize-deployment/kustomization.yaml](deploy/kustomize-deployment/kustomization.yaml)
+  from `gcr.io/k8s-staging-sp-operator/security-profiles-operator` to
   `k8s.gcr.io/security-profiles-operator/security-profiles-operator` (`newName`) and the
   corresponding tag (`newTag`). After that the make target `make bundle`
   has to be run and the changes have to be committed.
-- changes the tag in the same way in the OLM example manifest at
+- changes the `image` in the `CatalogSource` in the same way at
   [./examples/olm/install-resources.yaml](/examples/olm/install-resources.yaml)
 - changes [`hack/ci/e2e-olm.sh`](/hack/ci/e2e-olm.sh) to sed
-  `"s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.4.3#${CATALOG_IMG}#g"`
+  `"s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.0.0#${CATALOG_IMG}#g"`
   instead of
   `"s#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g"`
+  (please note to change the version `v0.0.0` to the upcoming release)
+- updates [./dependencies.yaml](./dependencies.yaml) `spo-current` version as
+  well as its linked files. Run `make verify-dependencies` to verify the
+  results.
 
 After this PR has been merged, we have to watch out the successful build of the
 container image via the automatically triggered
@@ -64,9 +68,9 @@ 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
   suffix `-dev`, for example `1.0.0-dev`.
 - changes the `images` `newName`/`newTag` fields in
-  [./deploy/base/kustomization.yaml](deploy/base/kustomization.yaml) back to
-  `gcr.io/k8s-staging-sp-operator/security-profiles-operator` (`newName`) and `latest`
-  (`newTag`) and runc `make bundle`
+  [./deploy/kustomize-deployment/kustomization.yaml](deploy/kustomize-deployment/kustomization.yaml)
+  back to `gcr.io/k8s-staging-sp-operator/security-profiles-operator`
+  (`newName`) and `latest` (`newTag`) and runc `make bundle`
 - 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)