Skip to content

Commit

Permalink
Back to dev
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert authored and k8s-ci-robot committed Feb 25, 2025
1 parent 94ff799 commit 5450473
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.0
0.9.1-dev
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,14 @@ metadata:
categories: Security
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
createdAt: "2025-02-25T13:34:54Z"
olm.skipRange: '>=0.4.1 <0.9.0'
olm.skipRange: '>=0.4.1 <0.9.1-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.37.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: security-profiles-operator.v0.9.0
name: security-profiles-operator.v0.9.1-dev
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -697,7 +697,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down Expand Up @@ -809,4 +809,4 @@ spec:
- image: quay.io/security-profiles-operator/selinuxd-fedora:latest
name: selinuxd-fedora
replaces: security-profiles-operator.v0.8.4
version: 0.9.0
version: 0.9.1-dev
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ dependencies:
match: BOM_VERSION

- name: spo-current
version: 0.9.0
version: 0.9.1-dev
refPaths:
- path: VERSION
match: ^.*
Expand Down
4 changes: 2 additions & 2 deletions deploy/catalog-preamble.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"package": "security-profiles-operator",
"entries": [
{
"name": "security-profiles-operator.v0.9.0",
"skipRange": ">=0.4.1 <0.9.0"
"name": "security-profiles-operator.v0.9.1-dev",
"skipRange": ">=0.4.1 <0.9.1-dev"
}
]
}
4 changes: 2 additions & 2 deletions deploy/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: security-profiles-operator
description: "The Kubernetes Security Profiles Operator."
type: application
version: "0.9.0"
appVersion: "0.9.0"
version: "0.9.1-dev"
appVersion: "0.9.1-dev"
8 changes: 4 additions & 4 deletions deploy/kustomize-deployment/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ sortOptions:

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.9.0
# newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
# newTag: v0.9.1


resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/namespace-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3351,7 +3351,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/openshift-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3342,7 +3342,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: image-registry.openshift-image-registry.svc:5000/openshift/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/openshift-downstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3362,7 +3362,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3349,7 +3349,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/webhook-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3349,7 +3349,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBELET_DIR
value: /var/lib/kubelet
image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion examples/olm/install-resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
namespace: olm
spec:
sourceType: grpc
image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.9.0
image: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
---
apiVersion: operators.coreos.com/v1alpha1
kind: Subscription
Expand Down
4 changes: 2 additions & 2 deletions hack/ci/e2e-olm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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
Expand Down Expand Up @@ -71,7 +71,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.9.0#${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

}

Expand Down
2 changes: 1 addition & 1 deletion hack/deploy-localhost.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0
- image: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
- imagePullPolicy: Always
+ image: localhost/security-profiles-operator:latest
+ imagePullPolicy: IfNotPresent
Expand Down
4 changes: 2 additions & 2 deletions test/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,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", "imagePullPolicy: "+e.pullPolicy)
e.updateManifest(manifest, "image: .*registry.k8s.io/.*", "image: "+e.testImage)
e.updateManifest(manifest, "value: .*registry.k8s.io/.*", "value: "+e.testImage)
e.updateManifest(manifest, "image: .*gcr.io/k8s-staging-sp-operator/.*", "image: "+e.testImage)
e.updateManifest(manifest, "value: .*gcr.io/k8s-staging-sp-operator/.*", "value: "+e.testImage)

if e.selinuxEnabled {
e.updateManifest(manifest, "enableSelinux: false", "enableSelinux: true")
Expand Down

0 comments on commit 5450473

Please sign in to comment.