Skip to content

Commit

Permalink
Fixing make commands
Browse files Browse the repository at this point in the history
Signed-off-by: Tenshin Higashi <[email protected]>
  • Loading branch information
tenshinhigashi committed Oct 17, 2023
1 parent a4e1cf3 commit 7ef75c1
Show file tree
Hide file tree
Showing 14 changed files with 52 additions and 16 deletions.
7 changes: 6 additions & 1 deletion .github/actions/setup-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 1 addition & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion build-aux/generate.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) >$@
Expand Down
1 change: 1 addition & 0 deletions build-aux/lint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions charts/emissary-ingress/values.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ ambassador-agent:

service:
type: ClusterIP
port: 8080

resources:
{}
Expand Down
6 changes: 6 additions & 0 deletions k8s-config/emissary-defaultns/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions k8s-config/emissary-defaultns/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ image:
waitForApiext:
enabled: true
createRoles: true

agent:
enabled: true
6 changes: 6 additions & 0 deletions k8s-config/emissary-emissaryns/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions k8s-config/emissary-emissaryns/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ image:
waitForApiext:
enabled: true
createRoles: true

agent:
enabled: true
6 changes: 6 additions & 0 deletions k8s-config/kat-ambassador/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 6 additions & 0 deletions k8s-config/kat-rbac-multinamespace/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 6 additions & 0 deletions k8s-config/kat-rbac-singlenamespace/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion manifests/emissary/emissary-defaultns.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ metadata:
spec:
containers:
- args:
- 'emissary-ingress-ambassador-agent:'
- emissary-ingress-ambassador-agent:8080
command:
- wget
image: busybox
Expand Down
2 changes: 1 addition & 1 deletion manifests/emissary/emissary-emissaryns.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ metadata:
spec:
containers:
- args:
- 'emissary-ingress-ambassador-agent:'
- emissary-ingress-ambassador-agent:8080
command:
- wget
image: busybox
Expand Down

0 comments on commit 7ef75c1

Please sign in to comment.