Skip to content

Commit 9d77a69

Browse files
saschagrunertk8s-ci-robot
authored andcommitted
Bump to v0.5.0
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 51bd04c commit 9d77a69

13 files changed

+32
-30
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.4-dev
1+
0.5.0

bundle/manifests/security-profiles-operator.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ metadata:
9898
]
9999
capabilities: Basic Install
100100
categories: Security
101-
olm.skipRange: '>=0.4.1 <0.4.4-dev'
101+
olm.skipRange: '>=0.4.1 <0.5.0'
102102
operatorframework.io/suggested-namespace: security-profiles-operator
103103
operators.operatorframework.io/builder: operator-sdk-v1.22.2
104104
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
105-
name: security-profiles-operator.v0.4.4-dev
105+
name: security-profiles-operator.v0.5.0
106106
namespace: placeholder
107107
spec:
108108
apiservicedefinitions: {}
@@ -425,7 +425,7 @@ spec:
425425
valueFrom:
426426
fieldRef:
427427
fieldPath: metadata.namespace
428-
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
428+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
429429
imagePullPolicy: Always
430430
name: security-profiles-operator
431431
resources:
@@ -499,4 +499,4 @@ spec:
499499
name: rbac-proxy
500500
- image: quay.io/security-profiles-operator/selinuxd
501501
name: selinuxd
502-
version: 0.4.4-dev
502+
version: 0.5.0

dependencies.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ dependencies:
172172
match: BOM_VERSION
173173

174174
- name: spo-current
175-
version: 0.4.4-dev
175+
version: 0.5.0
176176
refPaths:
177177
- path: VERSION
178178
match: ^.*

deploy/helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: security-profiles-operator
33
description: "The Kubernetes Security Profiles Operator."
44
type: application
5-
version: "0.4.4-dev"
6-
appVersion: "0.4.4-dev"
5+
version: "0.5.0"
6+
appVersion: "0.5.0"

deploy/kustomize-deployment/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ kind: Kustomization
44

55
images:
66
- name: security-profiles-operator
7-
newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
8-
newTag: latest
7+
# newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
8+
# newTag: latest
99
# For images to be released:
10-
# newName: k8s.gcr.io/security-profiles-operator/security-profiles-operator
11-
# newTag: v0.4.4
10+
newName: k8s.gcr.io/security-profiles-operator/security-profiles-operator
11+
newTag: v0.5.0
1212

1313
commonLabels:
1414
app: security-profiles-operator

deploy/namespace-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2922,7 +2922,7 @@ spec:
29222922
valueFrom:
29232923
fieldRef:
29242924
fieldPath: metadata.namespace
2925-
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
2925+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
29262926
imagePullPolicy: Always
29272927
name: security-profiles-operator
29282928
resources:

deploy/openshift-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2920,7 +2920,7 @@ spec:
29202920
valueFrom:
29212921
fieldRef:
29222922
fieldPath: metadata.namespace
2923-
image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
2923+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
29242924
imagePullPolicy: Always
29252925
name: security-profiles-operator
29262926
resources:

deploy/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2920,7 +2920,7 @@ spec:
29202920
valueFrom:
29212921
fieldRef:
29222922
fieldPath: metadata.namespace
2923-
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
2923+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
29242924
imagePullPolicy: Always
29252925
name: security-profiles-operator
29262926
resources:

deploy/webhook-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2920,7 +2920,7 @@ spec:
29202920
valueFrom:
29212921
fieldRef:
29222922
fieldPath: metadata.namespace
2923-
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
2923+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator:v0.5.0
29242924
imagePullPolicy: Always
29252925
name: security-profiles-operator
29262926
resources:

examples/olm/install-resources.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
namespace: olm
1515
spec:
1616
sourceType: grpc
17-
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
17+
image: k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.5.0
1818
---
1919
apiVersion: operators.coreos.com/v1
2020
kind: OperatorGroup

hack/ci/e2e-olm.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ function build_and_push_packages() {
3131
OPERATOR_MANIFEST=deploy/operator-ci.yaml
3232

3333
# Create a manifest with local image
34-
pushd deploy/base
35-
kustomize edit set image security-profiles-operator=$IMG
36-
popd
37-
kustomize build --reorder=none deploy/overlays/cluster -o ${OPERATOR_MANIFEST}
34+
cp deploy/operator.yaml ${OPERATOR_MANIFEST}
35+
sed -i "s#k8s.gcr.io/security-profiles-operator/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
3836

3937
# this is a kludge, we need to make sure kustomize can be overwritten
4038
rm -f build/kustomize
@@ -62,7 +60,7 @@ function deploy_spo() {
6260
kubectl -ncert-manager wait --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
6361

6462
# let's roll..
65-
sed -i "s#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
63+
sed -i "s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.5.0#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
6664
kubectl create -f examples/olm/install-resources.yaml
6765
}
6866

installation-usage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/
158158
kubectl --namespace cert-manager wait --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
159159
# Install the chart from a release URL (note: helm also allows users to
160160
# specify a file path instead of a URL, if desired):
161-
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
161+
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
162162
```
163163

164164
### Installation on AKS

release.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,21 @@ The first PR targets this repository and:
1313

1414
- bumps the [`VERSION`](VERSION) file to the target version
1515
- changes the `images` `newName`/`newTag` fields of
16-
[./deploy/base/kustomization.yaml](deploy/base/kustomization.yaml) from
17-
`gcr.io/k8s-staging-sp-operator/security-profiles-operator` to
16+
[./deploy/kustomize-deployment/kustomization.yaml](deploy/kustomize-deployment/kustomization.yaml)
17+
from `gcr.io/k8s-staging-sp-operator/security-profiles-operator` to
1818
`k8s.gcr.io/security-profiles-operator/security-profiles-operator` (`newName`) and the
1919
corresponding tag (`newTag`). After that the make target `make bundle`
2020
has to be run and the changes have to be committed.
21-
- changes the tag in the same way in the OLM example manifest at
21+
- changes the `image` in the `CatalogSource` in the same way at
2222
[./examples/olm/install-resources.yaml](/examples/olm/install-resources.yaml)
2323
- changes [`hack/ci/e2e-olm.sh`](/hack/ci/e2e-olm.sh) to sed
24-
`"s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.4.3#${CATALOG_IMG}#g"`
24+
`"s#k8s.gcr.io/security-profiles-operator/security-profiles-operator-catalog:v0.0.0#${CATALOG_IMG}#g"`
2525
instead of
2626
`"s#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g"`
27+
(please note to change the version `v0.0.0` to the upcoming release)
28+
- updates [./dependencies.yaml](./dependencies.yaml) `spo-current` version as
29+
well as its linked files. Run `make verify-dependencies` to verify the
30+
results.
2731

2832
After this PR has been merged, we have to watch out the successful build of the
2933
container image via the automatically triggered
@@ -64,9 +68,9 @@ After that, another PR against this repository has to be created, which:
6468
- bumps the [`VERSION`](VERSION) file to the next minor version, but now including the
6569
suffix `-dev`, for example `1.0.0-dev`.
6670
- changes the `images` `newName`/`newTag` fields in
67-
[./deploy/base/kustomization.yaml](deploy/base/kustomization.yaml) back to
68-
`gcr.io/k8s-staging-sp-operator/security-profiles-operator` (`newName`) and `latest`
69-
(`newTag`) and runc `make bundle`
71+
[./deploy/kustomize-deployment/kustomization.yaml](deploy/kustomize-deployment/kustomization.yaml)
72+
back to `gcr.io/k8s-staging-sp-operator/security-profiles-operator`
73+
(`newName`) and `latest` (`newTag`) and runc `make bundle`
7074
- changes the tag in the same way in the OLM example manifest at
7175
[./examples/olm/install-resources.yaml](/examples/olm/install-resources.yaml)
7276
- reverts the changes to [`hack/ci/e2e-olm.sh`](/hack/ci/e2e-olm.sh)

0 commit comments

Comments
 (0)