Skip to content
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

upgrade(r3-corda-ent): ambassador to ambassador edge stack #2400

Merged
merged 2 commits into from
Oct 26, 2023
Merged

upgrade(r3-corda-ent): ambassador to ambassador edge stack #2400

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
dd5120b
r3corda-ent upgrade ambassador to ambassador edge stack
suvajit-sarkar Oct 25, 2023
0848d8c
Merge branch 'develop' into develop
suvajit-sarkar Oct 26, 2023
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
38 changes: 20 additions & 18 deletions platforms/r3-corda-ent/charts/float/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,6 @@ kind: Service
metadata:
name: {{ .Values.nodeName }}
namespace: {{ .Values.metadata.namespace }}
annotations:
getambassador.io/config: |
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ .Values.nodeName }}_{{ .Values.peerName }}_p2p_mapping
port: {{ .Values.ambassador.p2pPort }}
host: {{ .Values.nodeName }}.{{ .Values.peerName }}.{{ .Values.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.node.p2pPort }}
tls: false
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ .Values.nodeName }}_{{ .Values.peerName }}_tunnel_mapping
port: {{ .Values.ambassador.tunnelPort }}
host: {{ .Values.nodeName }}.{{ .Values.peerName }}.{{ .Values.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.bridge.tunnelPort }}
tls: false
labels:
run: {{ .Values.nodeName }}
app.kubernetes.io/name: {{ .Values.nodeName }}
Expand All @@ -50,3 +32,23 @@ spec:
protocol: TCP
port: {{ .Values.node.p2pPort }}
targetPort: {{ .Values.node.p2pPort }}
{{- if $.Values.ambassador }}
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: {{ .Values.nodeName }}-{{ .Values.peerName }}-p2p
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.ambassador.p2pPort }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.node.p2pPort }}
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: {{ .Values.nodeName }}-{{ .Values.peerName }}-tunnel
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.ambassador.tunnelPort }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.node.p2pPort }}
{{- end }}
61 changes: 41 additions & 20 deletions platforms/r3-corda-ent/charts/gateway/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,6 @@ kind: Service
metadata:
name: {{ .Values.nodeName }}
namespace: {{ .Values.metadata.namespace }}
{{ if $.Values.ambassador }}
annotations:
getambassador.io/config: |
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ .Values.nodeName }}-http
port: {{ .Values.ambassador.port }}
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.port }}
---
apiVersion: ambassador/v2
kind: TLSContext
name: {{ .Values.nodeName }}_mapping_tlscontext
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{ end }}
labels:
run: {{ .Values.nodeName }}
app.kubernetes.io/name: {{ .Values.nodeName }}
Expand All @@ -45,3 +25,44 @@ spec:
protocol: TCP
selector:
app: {{ .Values.nodeName }}
{{ if $.Values.ambassador }}
---
apiVersion: getambassador.io/v3alpha1
kind: Host
metadata:
name: {{ .Values.nodeName }}-host
spec:
hostname: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
acmeProvider:
authority: none
requestPolicy:
insecure:
action: Reject
tlsSecret:
name: {{ .Values.nodeName }}-ambassador-certs
namespace: {{ .Values.metadata.namespace }}
tls:
min_tls_version: v1.2
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: {{ .Values.nodeName }}-https
namespace: {{ .Values.metadata.namespace }}
spec:
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
port: {{ .Values.ambassador.port }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.port }}
---
apiVersion: getambassador.io/v3alpha1
kind: TLSContext
metadata:
name: {{ .Values.nodeName }}-tlscontext
namespace: {{ .Values.metadata.namespace }}
spec:
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{- end }}
62 changes: 41 additions & 21 deletions platforms/r3-corda-ent/charts/idman/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,6 @@ kind: Service
metadata:
name: {{ .Values.nodeName }}
namespace: {{ .Values.metadata.namespace }}
{{ if $.Values.ambassador }}
annotations:
getambassador.io/config: |
---
apiVersion: ambassador/v2
kind: Mapping
name: {{ .Values.nodeName }}-https
prefix: /
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.external.port }}
tls: false
---
apiVersion: ambassador/v2
kind: TLSContext
name: {{ .Values.nodeName }}_mapping_tlscontext
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{ end }}
labels:
run: {{ .Values.nodeName }}
app.kubernetes.io/name: {{ .Values.nodeName }}
Expand Down Expand Up @@ -60,3 +39,44 @@ spec:
targetPort: {{ .Values.service.adminListener.port }}
protocol: TCP
name: adminlistener
{{ if $.Values.ambassador }}
---
apiVersion: getambassador.io/v3alpha1
kind: Host
metadata:
name: {{ .Values.nodeName }}-host
spec:
hostname: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
acmeProvider:
authority: none
requestPolicy:
insecure:
action: Reject
tlsSecret:
name: {{ .Values.nodeName }}-ambassador-certs
namespace: {{ .Values.metadata.namespace }}
tls:
min_tls_version: v1.2
---
apiVersion: getambassador.io/v3alpha1
kind: Mapping
metadata:
name: {{ .Values.nodeName }}-https
namespace: {{ .Values.metadata.namespace }}
spec:
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
prefix: /
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.external.port }}
---
apiVersion: getambassador.io/v3alpha1
kind: TLSContext
metadata:
name: {{ .Values.nodeName }}-tlscontext
namespace: {{ .Values.metadata.namespace }}
spec:
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{- end }}
62 changes: 41 additions & 21 deletions platforms/r3-corda-ent/charts/nmap/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,6 @@ kind: Service
metadata:
name: {{ .Values.nodeName }}
namespace: {{ .Values.metadata.namespace }}
{{ if $.Values.ambassador }}
annotations:
getambassador.io/config: |
---
apiVersion: ambassador/v2
kind: Mapping
name: {{ .Values.nodeName }}-https
prefix: /
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.external.port }}
tls: false
---
apiVersion: ambassador/v2
kind: TLSContext
name: {{ .Values.nodeName }}_mapping_tlscontext
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{ end }}
labels:
run: {{ .Values.nodeName }}
app.kubernetes.io/name: {{ .Values.nodeName }}
Expand All @@ -57,3 +36,44 @@ spec:
targetPort: {{ .Values.service.adminListener.port }}
protocol: TCP
name: adminlistener
{{ if $.Values.ambassador }}
---
apiVersion: getambassador.io/v3alpha1
kind: Host
metadata:
name: {{ .Values.nodeName }}-host
spec:
hostname: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
acmeProvider:
authority: none
requestPolicy:
insecure:
action: Reject
tlsSecret:
name: {{ .Values.nodeName }}-ambassador-certs
namespace: {{ .Values.metadata.namespace }}
tls:
min_tls_version: v1.2
---
apiVersion: getambassador.io/v3alpha1
kind: Mapping
metadata:
name: {{ .Values.nodeName }}-https
namespace: {{ .Values.metadata.namespace }}
spec:
host: {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
prefix: /
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.external.port }}
---
apiVersion: getambassador.io/v3alpha1
kind: TLSContext
metadata:
name: {{ .Values.nodeName }}-tlscontext
namespace: {{ .Values.metadata.namespace }}
spec:
hosts:
- {{ .Values.nodeName }}.{{ .Values.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{- end }}
61 changes: 41 additions & 20 deletions platforms/r3-corda-ent/charts/node/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,6 @@ kind: Service
metadata:
name: {{ .Values.nodeName }}
namespace: {{ .Values.metadata.namespace }}
{{ if and ($.Values.nodeConf.ambassador.p2pAddress) (eq .Values.firewall.enabled false) }}
annotations:
getambassador.io/config: |
---
apiVersion: ambassador/v2
kind: TLSContext
name: {{ .Values.nodeName }}_context
hosts:
- {{ .Values.nodeName }}.{{ .Values.nodeConf.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ .Values.nodeName }}_p2p_mapping
port: {{ .Values.nodeConf.ambassador.p2pPort }}
host: {{ .Values.nodeName }}.{{ .Values.nodeConf.ambassador.external_url_suffix }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.p2pPort }}
{{ end }}
labels:
run: {{ .Values.nodeName }}
app.kubernetes.io/name: {{ .Values.nodeName }}
Expand Down Expand Up @@ -58,3 +38,44 @@ spec:
targetPort: {{ .Values.service.ssh.sshdPort }}
protocol: TCP
name: ssh
{{- if and ($.Values.nodeConf.ambassador.p2pAddress) (eq .Values.firewall.enabled false) }}
---
apiVersion: getambassador.io/v3alpha1
kind: Host
metadata:
name: {{ .Values.nodeName }}-host
spec:
hostname: {{ .Values.nodeName }}.{{ .Values.nodeConf.ambassador.external_url_suffix }}
acmeProvider:
authority: none
requestPolicy:
insecure:
action: Reject
tlsSecret:
name: {{ .Values.nodeName }}-ambassador-certs
namespace: {{ .Values.metadata.namespace }}
tls:
min_tls_version: v1.2
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: {{ .Values.nodeName }}-p2p
namespace: {{ .Values.metadata.namespace }}
spec:
host: {{ .Values.nodeName }}.{{ .Values.nodeConf.ambassador.external_url_suffix }}
port: {{ .Values.nodeConf.ambassador.p2pPort }}
service: {{ .Values.nodeName }}.{{ .Values.metadata.namespace }}:{{ .Values.service.p2pPort }}
---
apiVersion: getambassador.io/v3alpha1
kind: TLSContext
metadata:
name: {{ .Values.nodeName }}-tlscontext
namespace: {{ .Values.metadata.namespace }}
spec:
hosts:
- {{ .Values.nodeName }}.{{ .Values.nodeConf.ambassador.external_url_suffix }}
secret: {{ .Values.nodeName }}-ambassador-certs.{{ .Values.metadata.namespace }}
secret_namespacing: true
min_tls_version: v1.2
{{- end }}
Loading