diff --git a/Makefile b/Makefile index db8452701..f7d15383f 100644 --- a/Makefile +++ b/Makefile @@ -226,12 +226,12 @@ 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.12.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0) GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint .PHONY: golangci-lint golangci-lint: ## Download golangci-lint locally if necessary. - $(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0) + $(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.1) .PHONY: mockgen mockgen: ## Install mockgen locally. @@ -262,7 +262,7 @@ operator-sdk: set -e ;\ echo "Downloading ${OPERATOR_SDK}"; \ mkdir -p $(dir ${OPERATOR_SDK}) ;\ - curl -Lo ${OPERATOR_SDK} 'https://github.com/operator-framework/operator-sdk/releases/download/v1.25.2/operator-sdk_linux_amd64'; \ + curl -Lo ${OPERATOR_SDK} 'https://github.com/operator-framework/operator-sdk/releases/download/v1.32.0/operator-sdk_linux_amd64'; \ chmod +x ${OPERATOR_SDK}; \ fi @@ -324,7 +324,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/v1.26.1/$${OS}-$${ARCH}-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.31.0/$${OS}-$${ARCH}-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/api-hub/v1beta1/zz_generated.deepcopy.go b/api-hub/v1beta1/zz_generated.deepcopy.go index 217157c36..b471c7182 100644 --- a/api-hub/v1beta1/zz_generated.deepcopy.go +++ b/api-hub/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022. diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index b0737c9ca..d83724d89 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022. @@ -775,7 +774,8 @@ func (in *PreflightValidationStatus) DeepCopyInto(out *PreflightValidationStatus if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(CRStatus) (*in).DeepCopyInto(*out) } diff --git a/bundle-hub.Dockerfile b/bundle-hub.Dockerfile index 08b52a154..5544350d1 100644 --- a/bundle-hub.Dockerfile +++ b/bundle-hub.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=kernel-module-management-hub LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.2 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml b/bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml index 50a56db55..d90c7a8e5 100644 --- a/bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml +++ b/bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 service.beta.openshift.io/inject-cabundle: "true" creationTimestamp: null labels: diff --git a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml index 3b78cbe85..6ea374bd8 100644 --- a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml +++ b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml @@ -32,8 +32,9 @@ metadata: } ] capabilities: Basic Install + createdAt: "2023-11-15T16:36:56Z" operatorframework.io/suggested-namespace: openshift-kmm-hub - operators.operatorframework.io/builder: operator-sdk-v1.25.2 + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/rh-ecosystem-edge/kernel-module-management name: kernel-module-management-hub.v0.0.1 diff --git a/bundle-hub/metadata/annotations.yaml b/bundle-hub/metadata/annotations.yaml index b511809c3..cf067e3dc 100644 --- a/bundle-hub/metadata/annotations.yaml +++ b/bundle-hub/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: kernel-module-management-hub operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.2 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 91c90d966..f4590a55e 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=kernel-module-management LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.2 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml index 7ec5d9edb..8b6223b0d 100644 --- a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml +++ b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml @@ -48,8 +48,9 @@ metadata: } ] capabilities: Basic Install + createdAt: "2023-11-15T16:36:55Z" operatorframework.io/suggested-namespace: openshift-kmm - operators.operatorframework.io/builder: operator-sdk-v1.25.2 + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/rh-ecosystem-edge/kernel-module-management name: kernel-module-management.v0.0.1 diff --git a/bundle/manifests/kmm.sigs.x-k8s.io_modules.yaml b/bundle/manifests/kmm.sigs.x-k8s.io_modules.yaml index 6d0b2bfd1..63bd2d687 100644 --- a/bundle/manifests/kmm.sigs.x-k8s.io_modules.yaml +++ b/bundle/manifests/kmm.sigs.x-k8s.io_modules.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 service.beta.openshift.io/inject-cabundle: "true" creationTimestamp: null labels: diff --git a/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml b/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml index 26b805f98..6624b0463 100644 --- a/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml +++ b/bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 creationTimestamp: null labels: app.kubernetes.io/component: kmm diff --git a/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidations.yaml b/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidations.yaml index c97176f3a..a9dad7322 100644 --- a/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidations.yaml +++ b/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidations.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 creationTimestamp: null labels: app.kubernetes.io/component: kmm diff --git a/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml b/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml index 051bb2015..7da3f3f3b 100644 --- a/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml +++ b/bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 creationTimestamp: null labels: app.kubernetes.io/component: kmm diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 638b6e2d8..8db6bef55 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: kernel-module-management operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.2 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/ci/prow/check-api-changes b/ci/prow/check-api-changes index 75aae24eb..445064d1c 100755 --- a/ci/prow/check-api-changes +++ b/ci/prow/check-api-changes @@ -4,9 +4,9 @@ set -euxo pipefail make generate bundle bundle-hub -if [[ $(git diff) ]]; then +if [[ $(git diff -I'^ createdAt: ') ]]; then echo 'Please run `make generate bundle bundle-hub` and repush' echo 'The following differences were found:' - echo $(git diff) + echo $(git diff -I'^ createdAt: ') exit 1 fi diff --git a/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml b/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml index 1ff320eb6..420faf2b4 100644 --- a/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml +++ b/config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: managedclustermodules.hub.kmm.sigs.x-k8s.io spec: group: hub.kmm.sigs.x-k8s.io diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml index 86a94cf51..64001554b 100644 --- a/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml +++ b/config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: modules.kmm.sigs.x-k8s.io spec: group: kmm.sigs.x-k8s.io diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml index d92c8a9a4..2c6880fff 100644 --- a/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml +++ b/config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nodemodulesconfigs.kmm.sigs.x-k8s.io spec: group: kmm.sigs.x-k8s.io diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml index ab66621f9..087d4246e 100644 --- a/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml +++ b/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: preflightvalidations.kmm.sigs.x-k8s.io spec: group: kmm.sigs.x-k8s.io diff --git a/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml b/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml index 941c3dcb7..7b7e4ff12 100644 --- a/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml +++ b/config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: preflightvalidationsocp.kmm.sigs.x-k8s.io spec: group: kmm.sigs.x-k8s.io diff --git a/hack/download-kustomize b/hack/download-kustomize index a90baa878..27551e243 100755 --- a/hack/download-kustomize +++ b/hack/download-kustomize @@ -5,7 +5,7 @@ set -euxo pipefail : "$BINDIR" readonly TMP=$(mktemp -d) -readonly VERSION=5.0.1 +readonly VERSION=5.2.1 echo "Downloading kustomize in $TMP"