From 294bf137d1c4ee46b2dd7c1c2f9a6c6bcb550b93 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Wed, 11 Oct 2023 14:55:08 +0200 Subject: [PATCH] Fix up helm-chart task - Add a LICENSE file --- LICENSE | 2 ++ Makefile | 8 +++++--- config/manager/kustomization.yaml | 6 ++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..fe76f45 --- /dev/null +++ b/LICENSE @@ -0,0 +1,2 @@ +The cluster-reflector-controller is under the same license and commercial agreement as Weave GitOps Enterprise, and can only be used in conjunction. + diff --git a/Makefile b/Makefile index 9013b6e..54c6a28 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,7 @@ KUBECTL ?= kubectl KUSTOMIZE ?= $(LOCALBIN)/kustomize CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest +HELMIFY ?= $(LOCALBIN)/helmify ## Tool Versions KUSTOMIZE_VERSION ?= v5.1.1 @@ -170,10 +171,10 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. $(ENVTEST): $(LOCALBIN) test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest -HELMIFY = $(LOCALBIN)/helmify .PHONY: helmify -helmify: - $(call go-get-tool,$(HELMIFY),github.com/arttor/helmify/cmd/helmify@v0.4.3) +helmify: $(HELMIFY) +$(HELMIFY): $(LOCALBIN) + GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@v0.4.3 .PHONY: helm helm: manifests kustomize helmify @@ -188,5 +189,6 @@ helm-chart: manifests kustomize helmify helm lint charts/cluster-reflector-controller helm package charts/cluster-reflector-controller --app-version $(VERSION) --version $(CHART_VERSION) --destination /tmp/helm-repo +.PHONY: publish-helm-chart publish-helm-chart: helm-chart helm push /tmp/helm-repo/cluster-reflector-controller-${CHART_VERSION}.tgz oci://${CHART_REGISTRY} \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5c5f0b8..e0881cb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,2 +1,8 @@ resources: - manager.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: ghcr.io/weaveworks/cluster-reflector-controller + newTag: cd895b0