From 7ef75c1966e45c00eeaf188038aa6666a1c913ac Mon Sep 17 00:00:00 2001 From: Tenshin Higashi Date: Thu, 12 Oct 2023 15:51:31 -0400 Subject: [PATCH] Fixing make commands Signed-off-by: Tenshin Higashi --- .github/actions/setup-deps/action.yml | 7 ++++++- Makefile | 13 +------------ build-aux/generate.mk | 6 +++++- build-aux/lint.mk | 1 + charts/emissary-ingress/values.yaml.in | 1 + k8s-config/emissary-defaultns/Chart.lock | 6 ++++++ k8s-config/emissary-defaultns/values.yaml | 3 +++ k8s-config/emissary-emissaryns/Chart.lock | 6 ++++++ k8s-config/emissary-emissaryns/values.yaml | 3 +++ k8s-config/kat-ambassador/Chart.lock | 6 ++++++ k8s-config/kat-rbac-multinamespace/Chart.lock | 6 ++++++ k8s-config/kat-rbac-singlenamespace/Chart.lock | 6 ++++++ manifests/emissary/emissary-defaultns.yaml.in | 2 +- manifests/emissary/emissary-emissaryns.yaml.in | 2 +- 14 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 k8s-config/emissary-defaultns/Chart.lock create mode 100644 k8s-config/emissary-emissaryns/Chart.lock create mode 100644 k8s-config/kat-ambassador/Chart.lock create mode 100644 k8s-config/kat-rbac-multinamespace/Chart.lock create mode 100644 k8s-config/kat-rbac-singlenamespace/Chart.lock diff --git a/.github/actions/setup-deps/action.yml b/.github/actions/setup-deps/action.yml index 9326a198315..6d08cae3494 100644 --- a/.github/actions/setup-deps/action.yml +++ b/.github/actions/setup-deps/action.yml @@ -34,4 +34,9 @@ runs: - name: "Install Python requirements with pip" shell: bash run: python -m pip install awscli packaging - + # Helm Deps + - name: "Install Helm Dependencies" + shell: bash + run: | + helm repo add ambassador-agent https://s3.amazonaws.com/datawire-static-files/charts + helm repo update diff --git a/Makefile b/Makefile index 350b182e103..d370a21120d 100644 --- a/Makefile +++ b/Makefile @@ -78,19 +78,8 @@ HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1 CHART_DIR := $(OSS_HOME)/build-output/chart-$(patsubst v%,%,$(VERSION))_$(patsubst v%,%,$(CHART_VERSION)).d CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(CHART_DIR) --network host $(HELM_TEST_IMAGE) $(CHART_DIR)/ci.in/ct.sh -# FORCE: -# .PHONY: FORCE -# .SECONDARY: - -# $(OSS_HOME)/charts/emissary-ingress/charts: FORCE -# if test -f ../go.mod && test "$$(cd .. && go list -m)" == github.com/emissary-ingress/emissary/v3; then \ -# $(MAKE) -C .. $@; \ -# else \ -# cd $(@D) && helm dependency build && helm dependency update; \ -# fi - chart/lint: preflight-dev-kubeconfig - $(CT_EXEC) install --config /ct.yaml + $(CT_EXEC) lint --config /ct.yaml .PHONY: chart/lint chart/k3d-test: preflight-dev-kubeconfig diff --git a/build-aux/generate.mk b/build-aux/generate.mk index b2cce89dfba..570a513adcf 100644 --- a/build-aux/generate.mk +++ b/build-aux/generate.mk @@ -213,7 +213,11 @@ helm.namespace.emissary-defaultns-migration = default # IF YOU'RE LOOKING FOR *.yaml: recipes, look in main.mk. -$(OSS_HOME)/k8s-config/%/helm-expanded.yaml: \ +helm-dependency: $(boguschart_dir) + cd $(boguschart_dir) && helm dependency build +.PHONY: helm-dependency + +$(OSS_HOME)/k8s-config/%/helm-expanded.yaml: helm-dependency \ $(OSS_HOME)/k8s-config/%/values.yaml \ $(boguschart_dir) helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@ diff --git a/build-aux/lint.mk b/build-aux/lint.mk index 62ca0bece7c..28c409dafb3 100644 --- a/build-aux/lint.mk +++ b/build-aux/lint.mk @@ -54,6 +54,7 @@ format/isort: $(OSS_HOME)/venv # # Helm + lint-deps += $(tools/ct) $(chart_dir) lint-goals += lint/chart lint/chart: $(tools/ct) $(chart_dir) diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in index 4f5f7c2ba9d..f41ad095faf 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml.in @@ -441,6 +441,7 @@ ambassador-agent: service: type: ClusterIP + port: 8080 resources: {} diff --git a/k8s-config/emissary-defaultns/Chart.lock b/k8s-config/emissary-defaultns/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /dev/null +++ b/k8s-config/emissary-defaultns/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml index 8ba3e0d5744..c2b9962a69c 100644 --- a/k8s-config/emissary-defaultns/values.yaml +++ b/k8s-config/emissary-defaultns/values.yaml @@ -32,3 +32,6 @@ image: waitForApiext: enabled: true createRoles: true + +agent: + enabled: true diff --git a/k8s-config/emissary-emissaryns/Chart.lock b/k8s-config/emissary-emissaryns/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /dev/null +++ b/k8s-config/emissary-emissaryns/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml index db88da02503..c0bc7fce38e 100644 --- a/k8s-config/emissary-emissaryns/values.yaml +++ b/k8s-config/emissary-emissaryns/values.yaml @@ -33,3 +33,6 @@ image: waitForApiext: enabled: true createRoles: true + +agent: + enabled: true diff --git a/k8s-config/kat-ambassador/Chart.lock b/k8s-config/kat-ambassador/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /dev/null +++ b/k8s-config/kat-ambassador/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-multinamespace/Chart.lock b/k8s-config/kat-rbac-multinamespace/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /dev/null +++ b/k8s-config/kat-rbac-multinamespace/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/k8s-config/kat-rbac-singlenamespace/Chart.lock b/k8s-config/kat-rbac-singlenamespace/Chart.lock new file mode 100644 index 00000000000..39430612071 --- /dev/null +++ b/k8s-config/kat-rbac-singlenamespace/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ambassador-agent + repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 1.0.15 +digest: sha256:5b3ed48fcf6b0ee0e9638f7261dcd2a264ee72f0a5eede7d123ff2d4b3c7e958 +generated: "2023-09-28T14:30:39.695933-04:00" diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in index a1da18a2619..79f0d21a5ab 100644 --- a/manifests/emissary/emissary-defaultns.yaml.in +++ b/manifests/emissary/emissary-defaultns.yaml.in @@ -680,7 +680,7 @@ metadata: spec: containers: - args: - - 'emissary-ingress-ambassador-agent:' + - emissary-ingress-ambassador-agent:8080 command: - wget image: busybox diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in index 1a069111e09..336aa425212 100644 --- a/manifests/emissary/emissary-emissaryns.yaml.in +++ b/manifests/emissary/emissary-emissaryns.yaml.in @@ -680,7 +680,7 @@ metadata: spec: containers: - args: - - 'emissary-ingress-ambassador-agent:' + - emissary-ingress-ambassador-agent:8080 command: - wget image: busybox