Skip to content

Commit 261778a

Browse files
aalexandruaalexandadriananeci
authored
fix: Include crds in helm charts (#215)
* Include crds in helm charts * Include crds in helm charts * Update helm-docs version Co-authored-by: adriananeci <[email protected]> * Remove default leaderElection.namespace from values (#214) Co-authored-by: aalexand <[email protected]> --------- Co-authored-by: aalexand <[email protected]> Co-authored-by: adriananeci <[email protected]>
1 parent 5951e27 commit 261778a

File tree

8 files changed

+633
-7
lines changed

8 files changed

+633
-7
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,12 @@ kustomize: ## Download kustomize locally if necessary.
235235
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
236236
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=$(MANAGER_ROLE) webhook paths="$(shell pwd)/pkg/..." output:crd:artifacts:config=$(shell pwd)/config/crd/bases output:rbac:artifacts:config=$(shell pwd)/config/rbac
237237

238+
@echo 'Copying CRDs to the appropriate helm charts...'
239+
@cp -r $(shell pwd)/config/crd/bases/registry.ethos.adobe.com_clusters.yaml $(shell pwd)/charts/cluster-registry-client/crds/
240+
@cp -r $(shell pwd)/config/crd/bases/registry.ethos.adobe.com_servicemetadatawatchers.yaml $(shell pwd)/charts/cluster-registry-client/crds/
241+
@cp -r $(shell pwd)/config/crd/bases/registry.ethos.adobe.com_clustersyncs.yaml $(shell pwd)/charts/cluster-registry-sync-manager/crds/
242+
243+
238244
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
239245
$(CONTROLLER_GEN) object:headerFile="$(shell pwd)/hack/license_header.txt" paths="$(shell pwd)/pkg/api/..."
240246

@@ -247,3 +253,7 @@ SWAGGER_CLI = $(shell pwd)/bin/swag
247253
swagger:
248254
@[ -f $(SWAGGER_CLI) ] || GOBIN=$(shell pwd)/bin go install github.com/swaggo/swag/cmd/[email protected]
249255
$(SWAGGER_CLI) init --parseDependency --parseInternal --parseDepth 2 -g cmd/apiserver/apiserver.go --output pkg/apiserver/docs/
256+
257+
HELM_DOCS_VERSION ?= "1.14.2"
258+
helm-docs:
259+
@export use_docker="true"; if [ $$(command -v helm-docs) ]; then version=$$(helm-docs --version); if [ "$${version}" != "helm-docs version ${HELM_DOCS_VERSION}" ]; then use_docker="true"; else use_docker="false"; fi; fi; if [ "$$use_docker" == "true" ]; then docker run --rm --volume "$$(pwd):/helm-docs" jnorwood/helm-docs:v${HELM_DOCS_VERSION}; else helm-docs; fi

charts/cluster-registry-client/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ maintainers:
1515
- name: radu-catalina
1616
1717

18-
version: 0.2.7
19-
appVersion: v1.5.8
18+
version: 0.3.0
19+
appVersion: v1.6.0

charts/cluster-registry-client/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cluster-registry-client
22

3-
![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.5.8](https://img.shields.io/badge/AppVersion-v1.5.8-informational?style=flat-square)
3+
![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.6.0](https://img.shields.io/badge/AppVersion-v1.6.0-informational?style=flat-square)
44

55
Cluster Registry is a Rest API representing the source of record for all Kubernetes clusters in the infrastructure fleet. All clusters are automatically registered, and the information is accurately reflected in the Cluster Registry using a client-server architecture.
66

@@ -57,4 +57,4 @@ Cluster Registry is a Rest API representing the source of record for all Kuberne
5757
| terminationGracePeriodSeconds | int | `10` | |
5858

5959
----------------------------------------------
60-
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
60+
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

0 commit comments

Comments
 (0)