Skip to content

Commit a335dcc

Browse files
committed
Update third party dependencies
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 8756684 commit a335dcc

24 files changed

+46
-46
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
pull_request:
99
env:
1010
GO_VERSION: '1.23'
11-
NIX_VERSION: '2.18.1'
12-
BOM_VERSION: v0.5.1
11+
NIX_VERSION: '2.25.0'
12+
BOM_VERSION: v0.6.0
1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
cancel-in-progress: true

.github/workflows/olm_tests.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
run: |
2626
mkdir -p ${GITHUB_WORKSPACE}/build
2727
echo "${GITHUB_WORKSPACE}/build" >> ${GITHUB_PATH}
28-
make operator-sdk
29-
make opm
28+
make operator-sdk opm
3029
3130
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
3231
with:

Dockerfile.build-image

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# hash below relates to tag: bookworm-v1.0.3
16-
FROM registry.k8s.io/build-image/debian-base@sha256:b30608f5a81f8ba99b287322d0bfb77ec506adcce396147aa4a59699d69be3e0
15+
# hash below relates to tag: bookworm-v1.0.4
16+
FROM registry.k8s.io/build-image/debian-base@sha256:0a17678966f63e82e9c5e246d9e654836a33e13650a698adefede61bb5ca099e
1717
WORKDIR /work
1818

1919
RUN apt-get update && \
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424

2525
ENV USER=root
2626

27-
ARG NIX_VERSION=2.18.1
27+
ARG NIX_VERSION=2.25.0
2828
RUN wget https://nixos.org/releases/nix/nix-${NIX_VERSION}/nix-${NIX_VERSION}-x86_64-linux.tar.xz && \
2929
tar xf nix-${NIX_VERSION}-x86_64-linux.tar.xz && \
3030
groupadd -r -g 30000 nixbld && \

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ GO ?= go
1616

1717
GOLANGCI_LINT_VERSION = v1.62.0
1818
REPO_INFRA_VERSION = v0.2.5
19-
KUSTOMIZE_VERSION = 5.2.1
20-
OPERATOR_SDK_VERSION ?= v1.25.0
19+
KUSTOMIZE_VERSION = 5.5.0
20+
OPERATOR_SDK_VERSION ?= v1.37.0
2121
ZEITGEIST_VERSION = v0.5.4
2222
MDTOC_VERSION = v1.4.0
2323
CI_IMAGE ?= golang:1.23
@@ -581,7 +581,7 @@ bundle-push: ## Push the bundle image.
581581

582582
.PHONY: verify-bundle
583583
verify-bundle: bundle ## Verify the bundle doesn't alter the state of the tree
584-
hack/tree-status
584+
git diff -I'^ createdAt: '
585585

586586
.PHONY: opm
587587
OPM = $(BUILD_DIR)/opm

PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
domain: security-profiles-operator.x-k8s.io
22
layout:
3-
- go.kubebuilder.io/v3
3+
- go.kubebuilder.io/v4
44
plugins:
55
manifests.sdk.operatorframework.io/v2: {}
66
scorecard.sdk.operatorframework.io/v2: {}

bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=security-profiles-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=stable
99
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.0
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.37.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
12-
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
12+
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
1313

1414
# Labels for testing.
1515
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +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+
createdAt: "2024-11-13T09:48:41Z"
245246
olm.skipRange: '>=0.4.1 <0.8.5-dev'
246247
operatorframework.io/cluster-monitoring: "true"
247248
operatorframework.io/suggested-namespace: security-profiles-operator
248249
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
249250
Container Platform", "OpenShift Platform Plus"]'
250-
operators.operatorframework.io/builder: operator-sdk-v1.25.0
251-
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
251+
operators.operatorframework.io/builder: operator-sdk-v1.37.0
252+
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
252253
name: security-profiles-operator.v0.8.5-dev
253254
namespace: placeholder
254255
spec:
@@ -669,7 +670,7 @@ spec:
669670
- manager
670671
env:
671672
- name: RELATED_IMAGE_RBAC_PROXY
672-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
673+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
673674
- name: RELATED_IMAGE_SELINUXD
674675
value: quay.io/security-profiles-operator/selinuxd
675676
- name: RELATED_IMAGE_SELINUXD_EL8
@@ -795,7 +796,7 @@ spec:
795796
name: Kubernetes SIGs
796797
url: https://github.com/kubernetes-sigs
797798
relatedImages:
798-
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
799+
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
799800
name: rbac-proxy
800801
- image: quay.io/security-profiles-operator/selinuxd
801802
name: selinuxd

bundle/metadata/annotations.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ annotations:
66
operators.operatorframework.io.bundle.package.v1: security-profiles-operator
77
operators.operatorframework.io.bundle.channels.v1: stable
88
operators.operatorframework.io.bundle.channel.default.v1: stable
9-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.0
9+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.37.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
11-
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
11+
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
1212

1313
# Annotations for testing.
1414
operators.operatorframework.io.test.mediatype.v1: scorecard+v1

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66
machineType: E2_HIGHCPU_8
77
steps:
8-
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20231105-52c482caa0
8+
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241111-71c32dbdcc
99
entrypoint: bash
1010
env:
1111
- TAG=$_GIT_TAG

dependencies.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ dependencies:
2424
match: REPO_INFRA_VERSION
2525

2626
- name: kustomize
27-
version: 5.2.1
27+
version: 5.5.0
2828
refPaths:
2929
- path: Makefile
3030
match: KUSTOMIZE_VERSION
3131

3232
- name: operator-sdk
33-
version: v1.25.0
33+
version: v1.37.0
3434
refPaths:
3535
- path: Makefile
3636
match: OPERATOR_SDK_VERSION
3737

3838
- name: olm
39-
version: v0.18.2
39+
version: v0.30.0
4040
refPaths:
4141
- path: hack/ci/e2e-olm.sh
4242
match: OLM_VERSION
@@ -96,27 +96,27 @@ dependencies:
9696
match: config.vm.box
9797

9898
- name: debian-base-digest
99-
version: sha256:b30608f5a81f8ba99b287322d0bfb77ec506adcce396147aa4a59699d69be3e0
99+
version: sha256:0a17678966f63e82e9c5e246d9e654836a33e13650a698adefede61bb5ca099e
100100
refPaths:
101101
- path: Dockerfile.build-image
102102
match: registry.k8s.io/build-image/debian-base
103103

104104
- name: debian-base
105-
version: bookworm-v1.0.3
105+
version: bookworm-v1.0.4
106106
refPaths:
107107
- path: Dockerfile.build-image
108108
match: tag
109109

110110
- name: nix
111-
version: 2.18.1
111+
version: 2.25.0
112112
refPaths:
113113
- path: Dockerfile.build-image
114114
match: NIX_VERSION
115115
- path: .github/workflows/build.yml
116116
match: NIX_VERSION
117117

118118
- name: kube-rbac-proxy
119-
version: 0.15.0
119+
version: 0.16.0
120120
refPaths:
121121
- path: internal/pkg/manager/spod/bindata/spod.go
122122
match: gcr.io/kubebuilder/kube-rbac-proxy
@@ -138,13 +138,13 @@ dependencies:
138138
match: gcr.io/kubebuilder/kube-rbac-proxy
139139

140140
- name: gcb-docker-gcloud
141-
version: v20231105-52c482caa0
141+
version: v20241111-71c32dbdcc
142142
refPaths:
143143
- path: cloudbuild.yaml
144144
match: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
145145

146146
- name: libbpf
147-
version: 1.4.0
147+
version: 1.5.0
148148
refPaths:
149149
- path: hack/install-libbpf.sh
150150
match: VERSION
@@ -176,15 +176,15 @@ dependencies:
176176
match: baseProfileName
177177

178178
- name: cosign
179-
version: v2.2.1
179+
version: v2.4.1
180180
refPaths:
181181
- path: hack/ci/Vagrantfile-ubuntu
182182
match: COSIGN_VERSION
183183
- path: hack/ci/Vagrantfile-debian
184184
match: COSIGN_VERSION
185185

186186
- name: bom
187-
version: v0.5.1
187+
version: v0.6.0
188188
refPaths:
189189
- path: .github/workflows/build.yml
190190
match: BOM_VERSION
@@ -243,7 +243,7 @@ dependencies:
243243
match: MDTOC_VERSION
244244

245245
- name: yq
246-
version: 4.35.2
246+
version: 4.44.3
247247
refPaths:
248248
- path: hack/ci/install-yq.sh
249249
match: YQ_VERSION

deploy/base/clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
capabilities: Basic Install
88
categories: Security
99
containerImage: registry.k8s.io/security-profiles-operator/security-profiles-operator:v0.8.4
10-
olm.skipRange: '>=0.4.1 <0.4.2-dev'
10+
olm.skipRange: '>=0.4.1 <0.8.5-dev'
1111
operatorframework.io/suggested-namespace: security-profiles-operator
1212
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'
1313
operatorframework.io/cluster-monitoring: "true"

deploy/helm/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- manager
2626
env:
2727
- name: RELATED_IMAGE_RBAC_PROXY
28-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
28+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
2929
- name: RELATED_IMAGE_SELINUXD
3030
value: {{ .Values.selinuxdImage.default.registry }}/{{ .Values.selinuxdImage.default.repository }}:{{ .Values.selinuxdImage.default.tag }}
3131
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/kustomize-deployment/manager_deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
cpu: 500m
3737
env:
3838
- name: RELATED_IMAGE_RBAC_PROXY
39-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
39+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
4040
- name: RELATED_IMAGE_SELINUXD
4141
value: quay.io/security-profiles-operator/selinuxd
4242
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/namespace-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3094,7 +3094,7 @@ spec:
30943094
- name: RESTRICT_TO_NAMESPACE
30953095
value: NS_REPLACE
30963096
- name: RELATED_IMAGE_RBAC_PROXY
3097-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
3097+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
30983098
- name: RELATED_IMAGE_SELINUXD
30993099
value: quay.io/security-profiles-operator/selinuxd
31003100
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/openshift-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3085,7 +3085,7 @@ spec:
30853085
- manager
30863086
env:
30873087
- name: RELATED_IMAGE_RBAC_PROXY
3088-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
3088+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
30893089
- name: RELATED_IMAGE_SELINUXD
30903090
value: quay.io/security-profiles-operator/selinuxd
30913091
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/openshift-downstream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3105,7 +3105,7 @@ spec:
31053105
- manager
31063106
env:
31073107
- name: RELATED_IMAGE_RBAC_PROXY
3108-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
3108+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
31093109
- name: RELATED_IMAGE_SELINUXD
31103110
value: quay.io/security-profiles-operator/selinuxd
31113111
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3092,7 +3092,7 @@ spec:
30923092
- manager
30933093
env:
30943094
- name: RELATED_IMAGE_RBAC_PROXY
3095-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
3095+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
30963096
- name: RELATED_IMAGE_SELINUXD
30973097
value: quay.io/security-profiles-operator/selinuxd
30983098
- name: RELATED_IMAGE_SELINUXD_EL8

deploy/webhook-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3092,7 +3092,7 @@ spec:
30923092
- --webhook=false
30933093
env:
30943094
- name: RELATED_IMAGE_RBAC_PROXY
3095-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
3095+
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
30963096
- name: RELATED_IMAGE_SELINUXD
30973097
value: quay.io/security-profiles-operator/selinuxd
30983098
- name: RELATED_IMAGE_SELINUXD_EL8

hack/ci/Vagrantfile-debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Vagrant.configure("2") do |config|
5555
/vagrant/hack/install-libbpf.sh
5656
5757
# Install cosign (required by e2e-baseprofile test)
58-
COSIGN_VERSION=v2.2.1
58+
COSIGN_VERSION=v2.4.1
5959
COSIGN_BINARY=/usr/bin/cosign
6060
curl -sSfL --retry 5 --retry-delay 3 "https://github.com/sigstore/cosign/releases/download/$COSIGN_VERSION/cosign-linux-amd64" -o "$COSIGN_BINARY"
6161
chmod +x "$COSIGN_BINARY"

hack/ci/Vagrantfile-ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Vagrant.configure("2") do |config|
5757
podman load -i /vagrant/image.tar
5858
5959
# Baseprofile recording requires cosign
60-
COSIGN_VERSION=v2.2.1
60+
COSIGN_VERSION=v2.4.1
6161
COSIGN_BINARY=/usr/bin/cosign
6262
curl -sSfL --retry 5 --retry-delay 3 "https://github.com/sigstore/cosign/releases/download/$COSIGN_VERSION/cosign-linux-amd64" -o "$COSIGN_BINARY"
6363
chmod +x "$COSIGN_BINARY"

hack/ci/e2e-olm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
set -euox pipefail
1717

18-
OLM_VERSION=v0.18.2
18+
OLM_VERSION=v0.30.0
1919

2020
REPO=localhost:5000
2121
IMG=${REPO}/security-profiles-operator:${GITHUB_SHA}

hack/ci/install-yq.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set -euo pipefail
1717

1818
install_yq() {
1919
echo "Installing yq"
20-
YQ_VERSION=4.35.2
20+
YQ_VERSION=4.44.3
2121
curl_retry -o /usr/bin/yq \
2222
https://github.com/mikefarah/yq/releases/download/v$YQ_VERSION/yq_linux_amd64
2323
sudo chmod +x /usr/bin/yq

hack/install-libbpf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
set -euo pipefail
1717

18-
VERSION=1.4.0
18+
VERSION=1.5.0
1919
curl -sSfL --retry 5 --retry-delay 3 \
2020
"https://github.com/libbpf/libbpf/archive/refs/tags/v$VERSION.tar.gz" -o- |
2121
tar xfz -

internal/pkg/manager/spod/bindata/spod.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const (
5555
SelinuxdPrivateDir = "/var/run/selinuxd"
5656
SelinuxdSocketPath = SelinuxdPrivateDir + "/selinuxd.sock"
5757
SelinuxdDBPath = SelinuxdPrivateDir + "/selinuxd.db"
58-
MetricsImage = "gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0"
58+
MetricsImage = "gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0"
5959
sysKernelDebugPath = "/sys/kernel/debug"
6060
sysKernelSecurityPath = "/sys/kernel/security"
6161
InitContainerIDNonRootenabler = 0

0 commit comments

Comments
 (0)