From a488c800cc4e4d312df79769161fd273b8adc98c Mon Sep 17 00:00:00 2001 From: Quentin Barrand Date: Wed, 15 Nov 2023 10:26:39 -0600 Subject: [PATCH] Revert some changes to kustomization.yaml (#637) Bump versions for some of our generators. --- Makefile | 8 ++++---- api-hub/v1beta1/zz_generated.deepcopy.go | 1 - api/v1beta1/zz_generated.deepcopy.go | 4 ++-- .../hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml | 2 +- config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml | 2 +- .../crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml | 2 +- .../crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml | 2 +- config/manager/kustomization.yaml | 6 ++++-- hack/download-kustomize | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d91191775..a5c0a9b21 100644 --- a/Makefile +++ b/Makefile @@ -227,12 +227,12 @@ undeploy-hub: undeploy-kmm-hub undeploy-cert-manager ## Undeploy controller from 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.52.0) + $(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2) .PHONY: mockgen mockgen: ## Install mockgen locally. @@ -268,7 +268,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 @@ -313,7 +313,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 6f8977fcd..436413dfe 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. @@ -701,7 +700,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/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 7cff790c6..b46f050ef 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 1ee984ee1..3171ce4a8 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/manager/kustomization.yaml b/config/manager/kustomization.yaml index eb87b7edf..9924ec983 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,9 +9,11 @@ patches: images: - name: controller - newName: host.minikube.internal:5000/kmm + newName: gcr.io/k8s-staging-kmm/kernel-module-management-operator + newTag: latest - name: worker - newName: host.minikube.internal:5000/kmm-worker + newName: gcr.io/k8s-staging-kmm/kernel-module-management-worker + newTag: latest configMapGenerator: - files: 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"