First commit

Signed-off-by: Tenshin Higashi <[email protected]>

Makefile

@@ -74,6 +74,17 @@ $(call module,ambassador,$(OSS_HOME))
 include $(OSS_HOME)/build-aux/generate.mk
 include $(OSS_HOME)/build-aux/lint.mk
 
+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
+
 .git/hooks/prepare-commit-msg:
 	ln -s $(OSS_HOME)/tools/hooks/prepare-commit-msg $(OSS_HOME)/.git/hooks/prepare-commit-msg
 
@@ -93,6 +104,7 @@ deploy: push preflight-cluster
 deploy-only: preflight-dev-kubeconfig $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir)
 	mkdir -p $(OSS_HOME)/build/helm/ && \
 	($(tools/kubectl) --kubeconfig $(DEV_KUBECONFIG) create ns ambassador || true) && \
+	helm dependency build && \
 	helm template ambassador --output-dir $(OSS_HOME)/build/helm -n ambassador $(boguschart_dir) \
 		--set createNamespace=true \
 		--set service.selector.service=ambassador \

build-aux/lint.mk

@@ -54,11 +54,14 @@ format/isort: $(OSS_HOME)/venv
 
 #
 # Helm
+HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.0.0-rc.1
+CT_EXEC = docker run --rm -v $(KIND_KUBECONFIG):/root/.kube/config -v $(boguschart_dir):/charts --network host $(HELM_TEST_IMAGE) /charts/emissary-ingress/ci.in/ct.sh
 
 lint-deps += $(tools/ct) $(chart_dir)
 lint-goals += lint/chart
 lint/chart: $(tools/ct) $(chart_dir)
-	cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml
+	$(CT_EXEC) lint --config /charts/ct.yaml
+# cd $(chart_dir) && $(abspath $(tools/ct)) lint --config=./ct.yaml
 .PHONY: lint/chart
 
 #

charts/emissary-ingress/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"

charts/emissary-ingress/Chart.yaml.in

@@ -16,12 +16,19 @@ keywords:
 - emissary
 - emissary ingress
 maintainers:
-- name: flydiverny
-  email: [email protected]
-- name: kflynn
-  email: [email protected]
-- name: nbkrause
-  email: [email protected]
-- name: lukeshu
-  email: [email protected]
+  - name: Alice Wasko
+    email: [email protected]
+  - name: Hamzah Qudsi
+    email: [email protected]
+  - name: Lance Austin
+    email: [email protected]
+  - name: Rick Lane
+    email: [email protected]
+  - name: Tenshin Higashi
+    email: [email protected]
 engine: gotpl
+dependencies:
+  - name: ambassador-agent
+    version: 1.0.15
+    repository: https://s3.amazonaws.com/datawire-static-files/charts
+    condition: agent.enabled

charts/emissary-ingress/ci.in/ct.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -ex
+
+helm repo add ambassador-agent https://s3.amazonaws.com/datawire-static-files/charts || helm repo update
+
+ct "$@"