From 70b305abbba669a83a7df2e2683f64dfadd70118 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Mon, 23 Oct 2023 17:14:29 +0200 Subject: [PATCH 1/3] Add v1alpha1 back to registered schemes --- main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.go b/main.go index 7fb8baea5..2977b30c4 100644 --- a/main.go +++ b/main.go @@ -44,6 +44,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" + // nolint:staticcheck + flowsv1alpha1 "github.com/netobserv/network-observability-operator/api/v1alpha1" flowsv1beta1 "github.com/netobserv/network-observability-operator/api/v1beta1" flowsv1beta2 "github.com/netobserv/network-observability-operator/api/v1beta2" "github.com/netobserv/network-observability-operator/controllers" @@ -63,6 +65,7 @@ var ( func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) + utilruntime.Must(flowsv1alpha1.AddToScheme(scheme)) utilruntime.Must(flowsv1beta1.AddToScheme(scheme)) utilruntime.Must(flowsv1beta2.AddToScheme(scheme)) utilruntime.Must(corev1.AddToScheme(scheme)) From e529a230f556104d968f28f567c9f85d2eed1b10 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Tue, 24 Oct 2023 15:02:36 +0200 Subject: [PATCH 2/3] Deprecate v1alpha1 --- api/v1alpha1/flowcollector_types.go | 1 + bundle/manifests/flows.netobserv.io_flowcollectors.yaml | 1 + config/crd/bases/flows.netobserv.io_flowcollectors.yaml | 1 + hack/cloned.flows.netobserv.io_flowcollectors.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/api/v1alpha1/flowcollector_types.go b/api/v1alpha1/flowcollector_types.go index 75050d0f4..a1038ea34 100644 --- a/api/v1alpha1/flowcollector_types.go +++ b/api/v1alpha1/flowcollector_types.go @@ -663,6 +663,7 @@ type FlowCollectorStatus struct { Namespace string `json:"namespace,omitempty"` } +// +kubebuilder:deprecatedversion // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:scope=Cluster diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml index 788ef5fe7..7f82302e7 100644 --- a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml +++ b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml @@ -39,6 +39,7 @@ spec: - jsonPath: .status.conditions[*].reason name: Status type: string + deprecated: true name: v1alpha1 schema: openAPIV3Schema: diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml index ec6b086e8..980018a9e 100644 --- a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml +++ b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml @@ -29,6 +29,7 @@ spec: - jsonPath: .status.conditions[*].reason name: Status type: string + deprecated: true name: v1alpha1 schema: openAPIV3Schema: diff --git a/hack/cloned.flows.netobserv.io_flowcollectors.yaml b/hack/cloned.flows.netobserv.io_flowcollectors.yaml index 2f7911862..5cf40fae3 100644 --- a/hack/cloned.flows.netobserv.io_flowcollectors.yaml +++ b/hack/cloned.flows.netobserv.io_flowcollectors.yaml @@ -29,6 +29,7 @@ spec: - jsonPath: .status.conditions[*].reason name: Status type: string + deprecated: true name: v1alpha1 schema: openAPIV3Schema: From f4d6d3d3b510c1c48146062a818ad99cd822d3a2 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Wed, 25 Oct 2023 09:19:13 +0200 Subject: [PATCH 3/3] Fix yq version not pinned/downloaded --- Makefile | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00e083aec..d7ea87f82 100644 --- a/Makefile +++ b/Makefile @@ -241,6 +241,20 @@ ifeq (,$(shell which $(OPSDK) 2>/dev/null)) } endif +.PHONY: yq +YQ = ./bin/yq +YQ: ## Download yq locally if necessary. +ifeq (,$(shell which $(YQ) 2>/dev/null)) + @{ \ + echo "### Downloading yq"; \ + set -e ;\ + mkdir -p $(dir $(YQ)) ;\ + OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(YQ) https://github.com/mikefarah/yq/releases/download/v4.35.2/yq_$${OS}_$${ARCH} ;\ + chmod +x $(YQ) ;\ + } +endif + ##@ Code / files generation manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases @@ -261,7 +275,11 @@ generate-go-conversions: $(CONVERSION_GEN) ## Run all generate-go-conversions $(CONVERSION_GEN_OUTPUT_BASE) \ --go-header-file=./hack/boilerplate/boilerplate.generatego.txt -generate: gencode manifests doc generate-go-conversions ## Run all code/file generators +generate: YQ gencode manifests doc generate-go-conversions ## Run all code/file generators + cat ./config/crd/bases/flows.netobserv.io_flowcollectors.yaml \ + | $(YQ) eval-all \ + '(.spec.versions.[]|select(.name != "v1beta2").storage) = false,(.spec.versions.[]|select(.name == "v1beta2").storage) = true' \ + > ./hack/cloned.flows.netobserv.io_flowcollectors.yaml .PHONY: clean-generated-conversions clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs @@ -382,7 +400,6 @@ bundle: bundle-prepare ## Generate final bundle files. update-bundle: VERSION=$(BUNDLE_VERSION) update-bundle: IMAGE_ORG=netobserv update-bundle: bundle ## Prepare a clean bundle to be commited - cat ./config/crd/bases/flows.netobserv.io_flowcollectors.yaml | yq eval-all '(.spec.versions.[]|select(.name != "v1beta2").storage) = false,(.spec.versions.[]|select(.name == "v1beta2").storage) = true' > ./hack/cloned.flows.netobserv.io_flowcollectors.yaml .PHONY: bundle-build bundle-build: ## Build the bundle image.