Merge pull request #5421 from emissary-ingress/tenshinhigashi/revert-…

…agent

Reverting Agent Changes

.github/actions/setup-deps/action.yml

@@ -34,9 +34,4 @@ 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 agent https://s3.amazonaws.com/datawire-static-files/charts
-        helm repo update
+

Makefile

@@ -74,27 +74,6 @@ $(call module,ambassador,$(OSS_HOME))
 include $(OSS_HOME)/build-aux/generate.mk
 include $(OSS_HOME)/build-aux/lint.mk
 
-HELM_TEST_IMAGE = quay.io/helmpack/chart-testing:v3.10.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
-
-chart/lint: preflight-dev-kubeconfig
-	$(CT_EXEC) lint --config /ct.yaml
-.PHONY: chart/lint
-
-chart/k3d-test: preflight-dev-kubeconfig
-	# check if k3d is installed
-	@if ! command -v k3d 2> /dev/null ; then \
-		printf 'k3d not installed, please do that'; \
-	    false; \
-	fi
-.PHONY: chart/k3d-test
-
-chart/test: chart/lint chart/k3d-test ci/setup-k3d
-	$(CT_EXEC) install --config /ct.yaml && \
-		$(MAKE) chart/delete-cluster
-.PHONY: chart/test
-
 .git/hooks/prepare-commit-msg:
 	ln -s $(OSS_HOME)/tools/hooks/prepare-commit-msg $(OSS_HOME)/.git/hooks/prepare-commit-msg
 
@@ -111,10 +90,9 @@ deploy: push preflight-cluster
 	$(MAKE) deploy-only
 .PHONY: deploy
 
-deploy-only: preflight-dev-kubeconfig chart/test $(tools/kubectl) build-output/yaml-$(patsubst v%,%,$(VERSION)) $(boguschart_dir)
+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/generate.mk

@@ -207,11 +207,7 @@ helm.namespace.emissary-defaultns-migration = default
 
 # IF YOU'RE LOOKING FOR *.yaml: recipes, look in main.mk.
 
-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/%/helm-expanded.yaml: \
   $(OSS_HOME)/k8s-config/%/values.yaml \
   $(boguschart_dir)
 	helm template --namespace=$(helm.namespace.$*) --values=$(@D)/values.yaml $(or $(helm.name.$*),$*) $(boguschart_dir) >$@

build-aux/main.mk

@@ -130,7 +130,6 @@ endif
 	}
 	$(tools/chart-doc-gen) -d $</doc.yaml -t $</readme.tpl -v $@/values.yaml >$@/README.md
 build-output/chart-%.tgz: build-output/chart-%.d
-	cd $< && helm dependency build
 	helm package --destination=$< $<
 	mv $</emissary-ingress-$(word 2,$(subst _, ,$*)).tgz $@
 

charts/emissary-ingress/Chart.yaml.in

@@ -1,4 +1,4 @@
-apiVersion: v2
+apiVersion: v1
 appVersion: @version@
 description: A Helm chart for Emissary Ingress
 name: emissary-ingress
@@ -16,19 +16,12 @@ keywords:
 - emissary
 - emissary ingress
 maintainers:
-  - 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]
-dependencies:
-  - name: ambassador-agent
-    version: 1.0.20
-    repository: https://s3.amazonaws.com/datawire-static-files/charts
-    condition: agent.enabled
-    alias: agent
+- name: flydiverny
+  email: [email protected]
+- name: kflynn
+  email: [email protected]
+- name: nbkrause
+  email: [email protected]
+- name: lukeshu
+  email: [email protected]
+engine: gotpl

charts/emissary-ingress/ct.yaml

@@ -19,9 +19,6 @@ charts:
   - ./
 chart-dirs:
   - ./
-chart-repos:
-  - datawire=https://s3.amazonaws.com/datawire-static-files/charts/
-  - datawiredev=https://s3.amazonaws.com/datawire-static-files/charts-dev/
 
 
 # namespace: ambassador