From 3cbb0d6ab7042428cc9ed7664165337f36f2400a Mon Sep 17 00:00:00 2001 From: Kevin McDermott Date: Tue, 20 Sep 2022 09:52:22 +0100 Subject: [PATCH] Regenerate and fix the namespace. --- Makefile | 11 +++++++++++ api/v1alpha1/groupversion_info.go | 4 ++-- config/default/kustomization.yaml | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a969d5b..c9bf901 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,9 @@ +# VERSION defines the project version for the bundle. +# Update this value when you upgrade the version of your project. +# To re-generate a bundle for another specific version without changing the standard setup, you can: +# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) +# - use environment variables to overwrite this value (e.g export VERSION=0.0.2) +VERSION ?= 0.0.1 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -47,6 +53,11 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." +.PHONY: release +release: manifests kustomize ## Generate a release file + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default > cluster-controller-v$(VERSION).yaml + .PHONY: fmt fmt: ## Run go fmt against code. go fmt ./... diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index e59a6b2..d2518e5 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the gitops v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=gitops.weave.works +// +kubebuilder:object:generate=true +// +groupName=gitops.weave.works package v1alpha1 import ( diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5b1282c..1b8ba2e 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: cluster-controller-system +namespace: flux-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named