Skip to content

Commit

Permalink
Revert some changes to kustomization.yaml (#637)
Browse files Browse the repository at this point in the history
Bump versions for some of our generators.
  • Loading branch information
qbarrand authored Nov 15, 2023
1 parent b156020 commit a488c80
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion api-hub/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hack/download-kustomize
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit a488c80

Please sign in to comment.