Skip to content

Commit

Permalink
Bump versions for some of our generators (#885)
Browse files Browse the repository at this point in the history
  • Loading branch information
@qbarrand
qbarrand authored Nov 16, 2023
1 parent 3318a85 commit ea06b0f
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 26 deletions.
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

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

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
View file

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

2 changes: 1 addition & 1 deletion bundle-hub.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle-hub/metadata/annotations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/kernel-module-management.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/kmm.sigs.x-k8s.io_modules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ci/prow/check-api-changes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
View file
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
View file
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
View file
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
2 changes: 1 addition & 1 deletion config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidations.yaml
View file
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
2 changes: 1 addition & 1 deletion config/crd/bases/kmm.sigs.x-k8s.io_preflightvalidationsocp.yaml
View file
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: preflightvalidationsocp.kmm.sigs.x-k8s.io
spec:
group: kmm.sigs.x-k8s.io
Expand Down
2 changes: 1 addition & 1 deletion hack/download-kustomize
View file
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 ea06b0f

Please sign in to comment.