Skip to content

Commit 656a0e4

Browse files
saschagrunertk8s-ci-robot
saschagrunert
authored and
k8s-ci-robot
committed
Back to dev
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 86d7be8 commit 656a0e4

17 files changed

+101
-26
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.8.4
1+
0.8.5-dev

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,14 @@ metadata:
242242
capabilities: Basic Install
243243
categories: Security
244244
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
245-
olm.skipRange: '>=0.4.1 <0.8.4'
245+
olm.skipRange: '>=0.4.1 <0.8.5-dev'
246246
operatorframework.io/cluster-monitoring: "true"
247247
operatorframework.io/suggested-namespace: security-profiles-operator
248248
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
249249
Container Platform", "OpenShift Platform Plus"]'
250250
operators.operatorframework.io/builder: operator-sdk-v1.25.0
251251
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
252-
name: security-profiles-operator.v0.8.4
252+
name: security-profiles-operator.v0.8.5-dev
253253
namespace: placeholder
254254
spec:
255255
apiservicedefinitions: {}
@@ -874,7 +874,7 @@ spec:
874874
fieldPath: spec.nodeName
875875
- name: KUBELET_DIR
876876
value: /var/lib/kubelet
877-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
877+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
878878
imagePullPolicy: Always
879879
name: security-profiles-operator
880880
resources:
@@ -986,4 +986,4 @@ spec:
986986
- image: quay.io/security-profiles-operator/selinuxd-el9:latest
987987
name: selinuxd-el9
988988
replaces: security-profiles-operator.v0.8.3
989-
version: 0.8.4
989+
version: 0.8.5-dev

‎dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ dependencies:
186186
match: BOM_VERSION
187187

188188
- name: spo-current
189-
version: 0.8.4
189+
version: 0.8.5-dev
190190
refPaths:
191191
- path: VERSION
192192
match: ^.*

‎deploy/catalog-preamble.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"package": "security-profiles-operator",
1414
"entries": [
1515
{
16-
"name": "security-profiles-operator.v0.8.4",
17-
"skipRange": ">=0.4.1 <0.8.4"
16+
"name": "security-profiles-operator.v0.8.5-dev",
17+
"skipRange": ">=0.4.1 <0.8.5-dev"
1818
}
1919
]
2020
}

‎deploy/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
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.8.4"
6-
appVersion: "0.8.4"
5+
version: "0.8.5-dev"
6+
appVersion: "0.8.5-dev"

‎deploy/kustomize-deployment/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ kind: Kustomization
33

44
images:
55
- name: security-profiles-operator
6-
# newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
7-
# newTag: latest
6+
newName: gcr.io/k8s-staging-sp-operator/security-profiles-operator
7+
newTag: latest
88
# For images to be released:
9-
newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
10-
newTag: v0.8.4
9+
# newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
10+
# newTag: v0.8.5
1111

1212

1313
resources:

‎deploy/namespace-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3199,7 +3199,7 @@ spec:
31993199
fieldPath: spec.nodeName
32003200
- name: KUBELET_DIR
32013201
value: /var/lib/kubelet
3202-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
3202+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
32033203
imagePullPolicy: Always
32043204
name: security-profiles-operator
32053205
resources:

‎deploy/openshift-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3190,7 +3190,7 @@ spec:
31903190
fieldPath: spec.nodeName
31913191
- name: KUBELET_DIR
31923192
value: /var/lib/kubelet
3193-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
3193+
image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
31943194
imagePullPolicy: Always
31953195
name: security-profiles-operator
31963196
resources:

‎deploy/openshift-downstream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3210,7 +3210,7 @@ spec:
32103210
fieldPath: spec.nodeName
32113211
- name: KUBELET_DIR
32123212
value: /var/lib/kubelet
3213-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
3213+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
32143214
imagePullPolicy: Always
32153215
name: security-profiles-operator
32163216
resources:

‎deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3197,7 +3197,7 @@ spec:
31973197
fieldPath: spec.nodeName
31983198
- name: KUBELET_DIR
31993199
value: /var/lib/kubelet
3200-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
3200+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
32013201
imagePullPolicy: Always
32023202
name: security-profiles-operator
32033203
resources:

‎deploy/webhook-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3197,7 +3197,7 @@ spec:
31973197
fieldPath: spec.nodeName
31983198
- name: KUBELET_DIR
31993199
value: /var/lib/kubelet
3200-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
3200+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
32013201
imagePullPolicy: Always
32023202
name: security-profiles-operator
32033203
resources:

‎examples/olm/install-resources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
namespace: olm
1818
spec:
1919
sourceType: grpc
20-
image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.8.4
20+
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
2121
---
2222
apiVersion: operators.coreos.com/v1alpha1
2323
kind: Subscription

‎hack/back-to-dev.sh

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2024 The Kubernetes Authors.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
set -euo pipefail
17+
18+
GIT_ROOT=$(git rev-parse --show-toplevel)
19+
pushd "$GIT_ROOT" >/dev/null
20+
21+
VERSION=$(cat VERSION)
22+
VERSION_MAJOR=$(echo "$VERSION" | cut -d. -f1)
23+
VERSION_MINOR=$(echo "$VERSION" | cut -d. -f2)
24+
VERSION_PATCH=$(echo "$VERSION" | cut -d. -f3 | cut -d- -f1)
25+
NEXT_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$((VERSION_PATCH + 1))"
26+
DEV_VERSION="$NEXT_VERSION-dev"
27+
28+
echo "Bumping current version '$VERSION' back to development version '$DEV_VERSION'"
29+
30+
echo "$DEV_VERSION" >VERSION
31+
32+
sed -i \
33+
-e "s;image: registry.k8s.io/security-profiles-operator/security-profiles-operator.*;image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest;g" \
34+
-e "s/$VERSION/$DEV_VERSION/g" \
35+
deploy/namespace-operator.yaml \
36+
deploy/openshift-downstream.yaml \
37+
deploy/operator.yaml \
38+
deploy/webhook-operator.yaml
39+
40+
sed -i \
41+
-e 's;\(olm.skipRange.*\)'"$VERSION"';\1'"$DEV_VERSION"';g' \
42+
-e 's;\(name: security-profiles-operator.v\)'"$VERSION"';\1'"$DEV_VERSION"';g' \
43+
-e 's;\(version: \)'"$VERSION"';\1'"$DEV_VERSION"';g' \
44+
-e 's;image: registry.k8s.io/security-profiles-operator/security-profiles-operator.*;image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest;g' \
45+
bundle/manifests/security-profiles-operator.clusterserviceversion.yaml
46+
47+
sed -i "s;registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog.*;gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest;g" \
48+
examples/olm/install-resources.yaml
49+
50+
sed -i "s;image: registry.k8s.io/security-profiles-operator/security-profiles-operator.*;image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest;g" \
51+
deploy/openshift-dev.yaml
52+
53+
sed -i "s/$VERSION/$DEV_VERSION/g" \
54+
dependencies.yaml \
55+
deploy/catalog-preamble.json \
56+
deploy/helm/Chart.yaml
57+
58+
sed -i \
59+
-e 's;# \(newName: .*\);\1;g' \
60+
-e 's;# \(newTag: .*\);\1;g' \
61+
-e 's;\(newName: registry.k8s.io/.*\);# \1;g' \
62+
-e 's;\(newTag: \)v'"$VERSION"';# \1'"v$NEXT_VERSION"';g' \
63+
deploy/kustomize-deployment/kustomization.yaml
64+
65+
sed -i \
66+
-e 's;registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v'"$VERSION"';gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest;g' \
67+
-e 's;registry.k8s.io;gcr.io/k8s-staging-sp-operator;g' \
68+
hack/ci/e2e-olm.sh
69+
70+
sed -i 's;registry.k8s.io;gcr.io/k8s-staging-sp-operator;g' test/e2e_test.go
71+
72+
sed -i 's;registry.k8s.io/security-profiles-operator.*;gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest;g' \
73+
hack/deploy-localhost.patch
74+
75+
echo "Done. Commit the changes to a new branch and create a PR from it"

‎hack/ci/e2e-olm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function build_and_push_packages() {
4545

4646
# Create a manifest with local image
4747
cp deploy/operator.yaml ${OPERATOR_MANIFEST}
48-
sed -i "s#registry.k8s.io/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
48+
sed -i "s#gcr.io/k8s-staging-sp-operator/security-profiles-operator.*\$#${IMG}#" ${OPERATOR_MANIFEST}
4949
grep ${IMG} ${OPERATOR_MANIFEST} || exit 1
5050

5151
# this is a kludge, we need to make sure kustomize can be overwritten
@@ -73,7 +73,7 @@ function deploy_deps() {
7373
kubectl_wait -ncert-manager --for condition=ready pod -l app.kubernetes.io/instance=cert-manager
7474

7575
# All installation methods run off the same catalog
76-
sed -i "s#registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.8.4#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
76+
sed -i "s#gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest#${CATALOG_IMG}#g" examples/olm/install-resources.yaml
7777

7878
}
7979

‎hack/deploy-localhost.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ index d7bf1964..d2a9c614 100644
1515
fieldPath: spec.nodeName
1616
- name: KUBELET_DIR
1717
value: /var/lib/kubelet
18-
- image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
18+
- image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
1919
- imagePullPolicy: Always
2020
+ image: localhost/security-profiles-operator:latest
2121
+ imagePullPolicy: IfNotPresent

‎release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tool](https://github.com/kubernetes/release/tree/master/cmd/release-notes).
7171
Run `make nix-spoc` and attach the results from the `build` directory to the
7272
GitHub release.
7373

74-
After that, another PR against this repository has to be created, which:
74+
After that, run the `./hack/back-to-dev.sh` script, which will:
7575

7676
- bumps the [`VERSION`](VERSION) file to the next minor version, but now including the
7777
suffix `-dev`, for example `1.0.0-dev`.

‎test/e2e_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ func (e *e2e) deployOperator(manifest string) {
311311
// ones from the nodes
312312
e.logf("Setting imagePullPolicy to '%s' in manifest: %s", e.pullPolicy, manifest)
313313
e.updateManifest(manifest, "imagePullPolicy: Always", "imagePullPolicy: "+e.pullPolicy)
314-
e.updateManifest(manifest, "image: .*registry.k8s.io/.*", "image: "+e.testImage)
315-
e.updateManifest(manifest, "value: .*registry.k8s.io/.*", "value: "+e.testImage)
314+
e.updateManifest(manifest, "image: .*gcr.io/k8s-staging-sp-operator/.*", "image: "+e.testImage)
315+
e.updateManifest(manifest, "value: .*gcr.io/k8s-staging-sp-operator/.*", "value: "+e.testImage)
316316
if e.selinuxEnabled {
317317
e.updateManifest(manifest, "enableSelinux: false", "enableSelinux: true")
318318
}

0 commit comments

Comments
 (0)