diff --git a/VERSION b/VERSION index c0ab427224..39e898a4f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.1-dev +0.7.1 diff --git a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml index f0d5e145b1..40d7c0b9e1 100644 --- a/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml +++ b/bundle/manifests/security-profiles-operator.clusterserviceversion.yaml @@ -241,15 +241,15 @@ metadata: ] capabilities: Basic Install categories: Security - containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.0 - olm.skipRange: '>=0.4.1 <0.7.1-dev' + containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 + olm.skipRange: '>=0.4.1 <0.7.1' 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-dev + name: security-profiles-operator.v0.7.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -862,7 +862,7 @@ spec: fieldPath: spec.nodeName - name: KUBELET_DIR value: /var/lib/kubelet - image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: @@ -968,5 +968,5 @@ spec: name: rbac-proxy - image: quay.io/security-profiles-operator/selinuxd name: selinuxd - replaces: security-profiles-operator.v0.6.0 - version: 0.7.1-dev + replaces: security-profiles-operator.v0.7.0 + version: 0.7.1 diff --git a/dependencies.yaml b/dependencies.yaml index 67e1f336e0..35698cf28e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -206,7 +206,7 @@ dependencies: match: BOM_VERSION - name: spo-current - version: 0.7.1-dev + version: 0.7.1 refPaths: - path: VERSION match: ^.* diff --git a/deploy/base/clusterserviceversion.yaml b/deploy/base/clusterserviceversion.yaml index 02aaca4b07..f578248aba 100644 --- a/deploy/base/clusterserviceversion.yaml +++ b/deploy/base/clusterserviceversion.yaml @@ -6,7 +6,7 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Security - containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.0 + containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 olm.skipRange: '>=0.4.1 <0.4.2-dev' operatorframework.io/suggested-namespace: security-profiles-operator operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]' @@ -89,5 +89,5 @@ spec: provider: name: Kubernetes SIGs url: https://github.com/kubernetes-sigs - replaces: security-profiles-operator.v0.6.0 + replaces: security-profiles-operator.v0.7.0 version: 0.0.0 diff --git a/deploy/catalog-preamble.json b/deploy/catalog-preamble.json index 652aa17cd1..b2ab450ef8 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-dev", - "skipRange": ">=0.4.1 <0.7.1-dev" + "name": "security-profiles-operator.v0.7.1", + "skipRange": ">=0.4.1 <0.7.1" } ] } diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 9176dbcc1a..693357da45 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-dev" -appVersion: "0.7.1-dev" +version: "0.7.1" +appVersion: "0.7.1" diff --git a/deploy/kustomize-deployment/kustomization.yaml b/deploy/kustomize-deployment/kustomization.yaml index 9846938cad..0957f8dba1 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.1 resources: diff --git a/deploy/namespace-operator.yaml b/deploy/namespace-operator.yaml index 5f9df1d455..8f6a8fcc81 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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: diff --git a/deploy/openshift-dev.yaml b/deploy/openshift-dev.yaml index 8ed8bf9afa..3d4641c10c 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: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: diff --git a/deploy/openshift-downstream.yaml b/deploy/openshift-downstream.yaml index 5d7b0f4ad1..60fde85529 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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 92d0a7a573..f2faa11105 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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: diff --git a/deploy/webhook-operator.yaml b/deploy/webhook-operator.yaml index 3d71414a3c..3fa5e981cf 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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 imagePullPolicy: Always name: security-profiles-operator resources: diff --git a/examples/olm/install-resources.yaml b/examples/olm/install-resources.yaml index fd2c49734e..d9a43dbf66 100644 --- a/examples/olm/install-resources.yaml +++ b/examples/olm/install-resources.yaml @@ -17,7 +17,7 @@ metadata: namespace: olm spec: sourceType: grpc - image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest + image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.7.1 --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription diff --git a/hack/ci/e2e-olm.sh b/hack/ci/e2e-olm.sh index 483faf2a7c..8c5f151350 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#gcr.io/k8s-staging-sp-operator/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST} + sed -i "s#registry.k8s.io/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#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g" examples/olm/install-resources.yaml + sed -i "s#registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.7.1#${CATALOG_IMG}#g" examples/olm/install-resources.yaml } diff --git a/hack/deploy-localhost.patch b/hack/deploy-localhost.patch index 5e6bbf305a..c4738dbb43 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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest +- image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.7.1 - imagePullPolicy: Always + image: localhost/security-profiles-operator:latest + imagePullPolicy: IfNotPresent diff --git a/installation-usage.md b/installation-usage.md index 23f9973234..de0b4cf172 100644 --- a/installation-usage.md +++ b/installation-usage.md @@ -204,9 +204,9 @@ kubectl annotate ns $spo_ns \ --overwrite # Install the chart from the release URL (or a file path if desired) -helm install security-profiles-operator --namespace security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.7.1-dev/security-profiles-operator-0.7.1-dev.tgz +helm install security-profiles-operator --namespace security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.7.1/security-profiles-operator-0.7.1.tgz # Or update it with -# helm upgrade --install security-profiles-operator --namespace security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.7.1-dev/security-profiles-operator-0.7.1-dev.tgz +# helm upgrade --install security-profiles-operator --namespace security-profiles-operator https://github.com/kubernetes-sigs/security-profiles-operator/releases/download/v0.7.1/security-profiles-operator-0.7.1.tgz ``` #### Troubleshooting and maintenance diff --git a/test/e2e_test.go b/test/e2e_test.go index 526f47728d..83753ee991 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: .*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, "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, "value: .*quay.io/.*/selinuxd.*", fmt.Sprintf("value: %s", e.selinuxdImage)) if e.selinuxEnabled { e.updateManifest(manifest, "enableSelinux: false", "enableSelinux: true")