Skip to content

Update to emissary#4100 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aidanhahn merged 2 commits into from
Feb 9, 2022
Merged

Update to emissary#4100 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
307e254
make chart/update-emissary: Tidy, update the repo based on the version
LukeShu Feb 9, 2022
196f4ce
From apro.git: `make generate`
LukeShu Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions charts/charts.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ define _docgen
fi
endef

EMISSARY_CHART_REPO_GA = https://s3.amazonaws.com/datawire-static-files/charts
EMISSARY_CHART_REPO_PRE = https://s3.amazonaws.com/datawire-static-files/charts-dev
EMISSARY_CHART_REPO = $(if $(findstring -,$(EMISSARY_CHART_VERSION)),$(EMISSARY_CHART_REPO_PRE),$(EMISSARY_CHART_REPO_GA))
chart/update-emissary: $(YQ)
[ -n "${EMISSARY_CHART_VERSION}" ] || (echo "EMISSARY_CHART_VERSION must be set for non-GA pushes" && exit 1)
[ -n '$(EMISSARY_CHART_VERSION)' ] || (echo "EMISSARY_CHART_VERSION must be set for non-GA pushes" && exit 1)
rm -f $(CHART_DIR)/charts/emissary-ingress*.tgz
$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).version' "${EMISSARY_CHART_VERSION}"
$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).version' '$(patsubst v%,%,$(EMISSARY_CHART_VERSION))'
$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).repository' '$(EMISSARY_CHART_REPO)'
helm repo rm emissary-updater || true
helm repo add emissary-updater `$(YQ) r $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).repository'`
helm repo add emissary-updater '$(EMISSARY_CHART_REPO)'
helm dep update $(CHART_DIR)
git add $(CHART_DIR)/charts/emissary*.tgz $(CHART_DIR)/Chart.yaml $(CHART_DIR)/Chart.lock
.PHONY: chart/update-emissary

chart/docgen:
Expand Down
6 changes: 3 additions & 3 deletions charts/edge-stack/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: emissary-ingress
repository: https://s3.amazonaws.com/datawire-static-files/charts-dev
version: 7.3.0-rc.2
digest: sha256:e775b3ac12922dbf838a1a68eb4ad5bc531bb4e9aa76dc52b71edc234b91f383
generated: "2022-02-07T17:08:49.825495036-08:00"
version: 7.3.0-rc.2.0.20220209165154-b6cd397b4fb3
digest: sha256:5e851285aa6ea6b7dfe9a0625cb3604ae1be41d5226cc98208e7cb6b64e698ce
generated: "2022-02-09T10:10:32.32440863-07:00"
4 changes: 2 additions & 2 deletions charts/edge-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ maintainers:
engine: gotpl
dependencies:
- name: emissary-ingress
version: 7.3.0-rc.2
repository: "https://s3.amazonaws.com/datawire-static-files/charts-dev"
version: 7.3.0-rc.2.0.20220209165154-b6cd397b4fb3
repository: https://s3.amazonaws.com/datawire-static-files/charts-dev
4 changes: 2 additions & 2 deletions manifests/edge-stack/aes-ambassadorns-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion manifests/edge-stack/aes-ambassadorns-migration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 deletions manifests/edge-stack/aes-ambassadorns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -604,7 +604,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
4 changes: 2 additions & 2 deletions manifests/edge-stack/aes-defaultns-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion manifests/edge-stack/aes-defaultns-migration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 deletions manifests/edge-stack/aes-defaultns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -596,7 +596,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
4 changes: 2 additions & 2 deletions manifests/edge-stack/aes-emissaryns-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion manifests/edge-stack/aes-emissaryns-migration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 deletions manifests/edge-stack/aes-emissaryns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -604,7 +604,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 deletions manifests/edge-stack/aes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@ spec:
imagePullPolicy: IfNotPresent
command: [agent]
ports:
- containerPort: 8006
name: grpc
- containerPort: 8080
name: http
env:
- name: AGENT_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -604,7 +604,7 @@ spec:
containerPort: 8877
env:
- name: AMBASSADOR_GRPC_METRICS_SINK
value: edge-stack:8006
value: edge-stack-agent:80
- name: HOST_IP
valueFrom:
fieldRef:
Expand Down