Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ GO ?= go
GOLANGCI_LINT_VERSION = v2.10.1
REPO_INFRA_VERSION = v0.2.5
KUSTOMIZE_VERSION = 5.5.0
OPERATOR_SDK_VERSION ?= v1.37.0
OPERATOR_SDK_VERSION ?= v1.42.2
OPM_VERSION ?= v1.65.0
ZEITGEIST_VERSION = v0.5.4
MDTOC_VERSION = v1.4.0
CI_IMAGE ?= golang:$(shell sed -n 's;^go\s\(.*\);\1;p' go.mod)
Expand Down Expand Up @@ -625,7 +626,7 @@ ifeq (,$(shell which opm 2>/dev/null))
set -e ;\
mkdir -p $(dir $(OPM)) ;\
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/$(OPERATOR_SDK_VERSION)/$${OS}-$${ARCH}-opm ;\
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/$(OPM_VERSION)/$${OS}-$${ARCH}-opm ;\
chmod +x $(OPM) ;\
}
else
Expand All @@ -647,8 +648,8 @@ catalog-build: opm ## Build a catalog image.
$(eval TMP_DIR := $(shell mktemp -d))
$(eval CATALOG_DOCKERFILE := $(TMP_DIR).Dockerfile)
cp deploy/catalog-preamble.json $(TMP_DIR)/security-profiles-operator-catalog.json
$(OPM) $(OPM_EXTRA_ARGS) render $(BUNDLE_IMGS) >> $(TMP_DIR)/security-profiles-operator-catalog.json
$(OPM) generate dockerfile $(TMP_DIR)
XDG_RUNTIME_DIR=$(TMP_DIR) $(OPM) $(OPM_EXTRA_ARGS) render $(BUNDLE_IMGS) >> $(TMP_DIR)/security-profiles-operator-catalog.json
XDG_RUNTIME_DIR=$(TMP_DIR) $(OPM) generate dockerfile $(TMP_DIR)
$(CONTAINER_RUNTIME) build -f $(CATALOG_DOCKERFILE) -t $(CATALOG_IMG) $(shell dirname $(TMP_DIR))
rm -rf $(TMP_DIR) $(CATALOG_DOCKERFILE)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.1-dev
0.10.1
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=security-profiles-operator
LABEL operators.operatorframework.io.bundle.channels.v1=stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.2
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.42.2
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ data:
"sigaltstack",
"socket",
"stat",
"statx",
"statfs",
"statx",
"tgkill",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,17 @@ metadata:
]
capabilities: Basic Install
categories: Security
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.10.0
createdAt: "2026-02-09T07:45:11Z"
olm.skipRange: '>=0.4.1 <0.10.1-dev'
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.10.1
createdAt: "2026-04-01T07:47:04Z"
olm.skipRange: '>=0.4.1 <0.10.1'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/os.linux: supported
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.39.2
operators.operatorframework.io/builder: operator-sdk-v1.42.2
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: security-profiles-operator.v0.10.1-dev
name: security-profiles-operator.v0.10.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -708,7 +708,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.10.1
imagePullPolicy: Always
name: security-profiles-operator
resources:
Expand Down Expand Up @@ -820,4 +820,4 @@ spec:
- image: quay.io/security-profiles-operator/selinuxd-fedora:latest
name: selinuxd-fedora
replaces: security-profiles-operator.v0.9.1
version: 0.10.1-dev
version: 0.10.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.20.1
creationTimestamp: null
labels:
app: security-profiles-operator
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: security-profiles-operator
operators.operatorframework.io.bundle.channels.v1: stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.metrics.builder: operator-sdk-v1.39.2
operators.operatorframework.io.metrics.builder: operator-sdk-v1.42.2
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

Expand Down
10 changes: 8 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ dependencies:
match: KUSTOMIZE_VERSION

- name: operator-sdk
version: v1.37.0
version: v1.42.2
refPaths:
- path: Makefile
match: OPERATOR_SDK_VERSION

- name: opm
version: v1.65.0
refPaths:
- path: Makefile
match: OPM_VERSION

- name: olm
version: v0.30.0
refPaths:
Expand Down Expand Up @@ -162,7 +168,7 @@ dependencies:
match: BOM_VERSION

- name: spo-current
version: 0.10.1-dev
version: 0.10.1
refPaths:
- path: VERSION
match: ^.*
Expand Down
2 changes: 1 addition & 1 deletion deploy/base/clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
alm-examples: '[]'
capabilities: Basic Install
categories: Security
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.10.0
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.10.1
olm.skipRange: '>=0.4.1 <0.8.5-dev'
operatorframework.io/suggested-namespace: security-profiles-operator
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'
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.10.1-dev",
"skipRange": ">=0.4.1 <0.10.1-dev"
"name": "security-profiles-operator.v0.10.1",
"skipRange": ">=0.4.1 <0.10.1"
}
]
}
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.10.1-dev"
appVersion: "0.10.1-dev"
version: "0.10.1"
appVersion: "0.10.1"
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.10.1
newName: registry.k8s.io/security-profiles-operator/security-profiles-operator
newTag: v0.10.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 @@ -3479,7 +3479,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.10.1
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 @@ -3475,7 +3475,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.10.1
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 @@ -3495,7 +3495,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.10.1
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 @@ -3477,7 +3477,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.10.1
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 @@ -3477,7 +3477,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.10.1
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: gcr.io/k8s-staging-sp-operator/security-profiles-operator-catalog:latest
image: registry.k8s.io/security-profiles-operator/security-profiles-operator-catalog:v0.10.1
---
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#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
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#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.10.1#${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: gcr.io/k8s-staging-sp-operator/security-profiles-operator:latest
- image: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.10.1
- 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 @@ -330,8 +330,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: .*gcr.io/k8s-staging-sp-operator/.*", "image: "+e.testImage)
e.updateManifest(manifest, "value: .*gcr.io/k8s-staging-sp-operator/.*", "value: "+e.testImage)
e.updateManifest(manifest, "image: .*registry.k8s.io/.*", "image: "+e.testImage)
e.updateManifest(manifest, "value: .*registry.k8s.io/.*", "value: "+e.testImage)

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