From c189dcea5e18b9cb3f6036e11a614397f26460ec Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Tue, 26 Oct 2021 13:03:35 -0500 Subject: [PATCH 1/2] Update helm chart Signed-off-by: Keith Mattix II --- Makefile | 21 ++++++++++++++++++ docs/index.yaml | 6 ++--- docs/smi-controller-0.1.0.tgz | Bin 7138 -> 7759 bytes ...ion_httproutegroups.specs.smi-spec.io.yaml | 2 ++ ...efinition_tcproutes.specs.smi-spec.io.yaml | 2 ++ ...ition_trafficsplits.split.smi-spec.io.yaml | 2 ++ ...ion_traffictargets.access.smi-spec.io.yaml | 2 ++ ...efinition_udproutes.specs.smi-spec.io.yaml | 2 ++ 8 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bbcaf5c..d0d57c5 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,27 @@ build_docker_push: build_docker_setup --push docker buildx rm multi || true +generate_helm_darwin: manifests +# First generate the Helm specific kustomize config that creates the RBAC and CRDs + kustomize build ./config/helm -o ./helm/smi-controller/templates + +# Replace port with helm syntax, kustomize rejects Helm syntax not in quotes and this field is an integer + sed -i '' -e 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml + +# Delete extra files + rm ./helm/smi-controller/templates/v1_service_smi-controller-controller-manager-metrics-service.yaml + rm ./helm/smi-controller/templates/v1_serviceaccount_smi-controller-controller-manager.yaml + +# Now package the Helm chart into a tarball + helm package ./helm/smi-controller + +# Move it to the ./docs folder used to serve Github Pages + mv smi-controller-${DOCKER_VERSION}.tgz ./docs/ + +# Generate the index + cd ./docs && helm repo index . + + generate_helm: manifests # First generate the Helm specific kustomize config that creates the RBAC and CRDs kustomize build ./config/helm -o ./helm/smi-controller/templates diff --git a/docs/index.yaml b/docs/index.yaml index d9d6549..f4bcfa9 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,12 +3,12 @@ entries: smi-controller: - apiVersion: v2 appVersion: 1.16.0 - created: "2021-07-07T11:03:12.6044092+01:00" + created: "2021-10-26T13:01:07.587164-05:00" description: A Helm chart for installing the SMI Controller for Kubernetes - digest: 57ded2d3a1891c5847b6d1bf361f3687cf82b9a171a5a6932eef2de4ca04e4b0 + digest: 336c910965afcde54caeba9c66400999dff8578beef826e236dc17d24b69d011 name: smi-controller type: application urls: - smi-controller-0.1.0.tgz version: 0.1.0 -generated: "2021-07-07T11:03:12.6033949+01:00" +generated: "2021-10-26T13:01:07.585061-05:00" diff --git a/docs/smi-controller-0.1.0.tgz b/docs/smi-controller-0.1.0.tgz index 841bbfff7432b294937d2582ba41bd6bac4d798c..4f63940d389b17e917416b72ae877544acb88706 100644 GIT binary patch literal 7759 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 Date: Wed, 27 Oct 2021 10:02:24 -0500 Subject: [PATCH 2/2] Create a general generate_helm make target Signed-off-by: Keith Mattix II --- Makefile | 26 ++++---------------------- docs/index.yaml | 6 +++--- docs/smi-controller-0.1.0.tgz | Bin 7759 -> 7763 bytes 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index d0d57c5..51f7e62 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DOCKER_REPO=nicholasjackson/smi-controller-example DOCKER_VERSION=0.1.0 SHELL := /bin/bash +UNAME := $(shell uname) build_docker_setup: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes @@ -24,33 +25,14 @@ build_docker_push: build_docker_setup --push docker buildx rm multi || true -generate_helm_darwin: manifests -# First generate the Helm specific kustomize config that creates the RBAC and CRDs - kustomize build ./config/helm -o ./helm/smi-controller/templates - -# Replace port with helm syntax, kustomize rejects Helm syntax not in quotes and this field is an integer - sed -i '' -e 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml - -# Delete extra files - rm ./helm/smi-controller/templates/v1_service_smi-controller-controller-manager-metrics-service.yaml - rm ./helm/smi-controller/templates/v1_serviceaccount_smi-controller-controller-manager.yaml - -# Now package the Helm chart into a tarball - helm package ./helm/smi-controller - -# Move it to the ./docs folder used to serve Github Pages - mv smi-controller-${DOCKER_VERSION}.tgz ./docs/ - -# Generate the index - cd ./docs && helm repo index . - - generate_helm: manifests # First generate the Helm specific kustomize config that creates the RBAC and CRDs kustomize build ./config/helm -o ./helm/smi-controller/templates +# Pick the correct sed -i argument based on OS (Darwin uses BSD sed, not GNU sed) # Replace port with helm syntax, kustomize rejects Helm syntax not in quotes and this field is an integer - sed -i 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml + sedi=(-i) && [ "$(UNAME)" == "Darwin" ] && sedi=(-i '') ; \ + sed "$${sedi[@]}" -e 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml # Delete extra files rm ./helm/smi-controller/templates/v1_service_smi-controller-controller-manager-metrics-service.yaml diff --git a/docs/index.yaml b/docs/index.yaml index f4bcfa9..7e0e1ab 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,12 +3,12 @@ entries: smi-controller: - apiVersion: v2 appVersion: 1.16.0 - created: "2021-10-26T13:01:07.587164-05:00" + created: "2021-10-27T10:01:52.386136-05:00" description: A Helm chart for installing the SMI Controller for Kubernetes - digest: 336c910965afcde54caeba9c66400999dff8578beef826e236dc17d24b69d011 + digest: 05acf92c7bef959c26c2f7e8e71645e4fea9c9ca18d1af138bbfae54ecbfef4a name: smi-controller type: application urls: - smi-controller-0.1.0.tgz version: 0.1.0 -generated: "2021-10-26T13:01:07.585061-05:00" +generated: "2021-10-27T10:01:52.385317-05:00" diff --git a/docs/smi-controller-0.1.0.tgz b/docs/smi-controller-0.1.0.tgz index 4f63940d389b17e917416b72ae877544acb88706..6295b30fa7261b8e1fb2c365d4770cde5f4670cc 100644 GIT binary patch delta 7218 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

qU3BhO0 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 AU;qFB delta 7231 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