Skip to content

Commit

Permalink
Bumping to [email protected] and rhel-9.5.
Browse files Browse the repository at this point in the history
Also bumping the api and client dependencies.

Signed-off-by: Yoni Bettan <[email protected]>
  • Loading branch information
ybettan committed Dec 8, 2024
1 parent 4ee39c5 commit 2644c88
Show file tree
Hide file tree
Showing 2,697 changed files with 162,150 additions and 76,644 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- if: matrix.language == 'go'
uses: actions/setup-go@v4
with:
go-version: '1.21'
go-version: '1.22'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder

# Copy the Go Modules manifests
COPY go.mod go.mod
Expand Down Expand Up @@ -27,7 +27,7 @@ ARG TARGET
RUN git config --global --add safe.directory ${PWD}
RUN make ${TARGET}

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

ARG TARGET

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.must-gather
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/openshift/origin-cli:4.20 as builder

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

RUN microdnf update -y \
&& microdnf install -y tar rsync findutils gzip iproute util-linux shadow-utils \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.signimage
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 as ksource
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 as ksource

# install the package that will contain the sign utilities
RUN microdnf update -y && \
microdnf install -y kernel-devel && \
microdnf clean all

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

COPY --from=ksource /usr/src/kernels/*/scripts/sign-file /usr/local/bin/

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.webhook
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder

# Copy the Go Modules manifests
COPY go.mod go.mod
Expand All @@ -25,7 +25,7 @@ COPY .git .git
RUN git config --global --add safe.directory ${PWD}
RUN make webhook-server

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

COPY --from=builder /opt/app-root/src/webhook-server /usr/local/bin/webhook-server

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.worker
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder

# Add the vendored dependencies
COPY vendor vendor
Expand All @@ -24,7 +24,7 @@ COPY .git .git
RUN git config --global --add safe.directory ${PWD}
RUN ["make", "worker"]

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5

RUN microdnf update -y && \
microdnf install -y kmod shadow-utils && \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ undeploy-hub: ## Undeploy controller from the K8s cluster specified in ~/.kube/c
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1)

GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
.PHONY: golangci-lint
Expand Down
240 changes: 188 additions & 52 deletions bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2024-09-08T06:59:15Z"
createdAt: "2024-11-27T11:44:06Z"
operatorframework.io/suggested-namespace: openshift-kmm-hub
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down Expand Up @@ -108,21 +108,7 @@ spec:
- ""
resources:
- nodes
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2024-09-08T06:59:14Z"
createdAt: "2024-11-27T11:44:05Z"
operatorframework.io/suggested-namespace: openshift-kmm
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down Expand Up @@ -165,6 +165,7 @@ spec:
- ""
resources:
- configmaps
- pods
verbs:
- create
- delete
Expand All @@ -176,42 +177,16 @@ spec:
- ""
resources:
- namespaces
verbs:
- get
- list
- patch
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- list
- patch
- watch
- apiGroups:
- ""
resources:
- pods
verbs:
- create
- delete
- get
- list
- patch
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- get
Expand All @@ -229,6 +204,8 @@ spec:
- kmm.sigs.x-k8s.io
resources:
- modules
- preflightvalidations/status
- preflightvalidationsocp
verbs:
- get
- list
Expand All @@ -239,12 +216,15 @@ spec:
- kmm.sigs.x-k8s.io
resources:
- modules/finalizers
- preflightvalidations/finalizers
- preflightvalidationsocp/finalizers
verbs:
- update
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- modules/status
- preflightvalidationsocp/status
verbs:
- get
- patch
Expand Down Expand Up @@ -285,46 +265,6 @@ spec:
- patch
- update
- watch
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- preflightvalidations/finalizers
verbs:
- update
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- preflightvalidations/status
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- preflightvalidationsocp
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- preflightvalidationsocp/finalizers
verbs:
- update
- apiGroups:
- kmm.sigs.x-k8s.io
resources:
- preflightvalidationsocp/status
verbs:
- get
- patch
- update
- apiGroups:
- authentication.k8s.io
resources:
Expand Down
Loading

0 comments on commit 2644c88

Please sign in to comment.