Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,6 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

helloworldAppPackage/
csar-output/
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,6 @@ data:
validation_context:
trusted_ca:
filename: {{ printf "%s/%s" (default $.Values.instantiationDefaults.proxyCaCertMountPath $.Values.proxyCaCertMountPath) (default $.Values.instantiationDefaults.platformCaCertFileName $.Values.platformCaCertFileName) | quote }}
# Plain HTTP listener for other endpoints
- name: listener_http
address:
socket_address:
address: 0.0.0.0
port_value: 8080
filter_chains:
- filters:
- name: envoy.filters.network.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
stat_prefix: ingress_http_plain
route_config:
virtual_hosts:
- name: plain_service
domains: ["*"]
routes:
- match:
path: "/sample-app/python/health"
route:
cluster: eric-oss-hello-world-python-app-cluster
http_filters:
- name: envoy.filters.http.router
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router

clusters:
- name: eric-oss-hello-world-python-app-cluster
type: STATIC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ spec:
value: "/etc/adp/logcontrol.json"
{{- include "eric-oss-hello-world-python-app.jaegerEnv" . | indent 12 }}
ports:
- name: http-metrics
- name: http
containerPort: 8050
protocol: TCP
livenessProbe:
Expand Down Expand Up @@ -215,9 +215,6 @@ spec:
command: ["envoy"]
args: ["-c", "/etc/envoy/envoy.yaml", "--base-id", "1"]
ports:
- name: envoy-http
containerPort: 8080
protocol: TCP
- name: envoy-https
containerPort: 8443
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ spec:
ipFamilies: [{{ .Values.global.internalIPFamily }}]
{{- end }}
ports:
- port: {{ index .Values.service "http-port" }}
targetPort: {{ .Values.service.httpTargetPort | default 8080 }}
protocol: TCP
name: envoy-http
- port: {{ index .Values.service "https-port" }}
targetPort: {{ .Values.service.httpsTargetPort | default 8443 }}
protocol: TCP
Expand Down
1 change: 0 additions & 1 deletion charts/eric-oss-hello-world-python-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ seccompProfile:

service:
type: ClusterIP
http-port: 8080
https-port: 8443

resources:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ services:
depends_on:
- app
ports:
- "8080:8080"
- "8443:8443"
4 changes: 2 additions & 2 deletions envoy.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM envoyproxy/envoy:distroless-v1.35.0
FROM envoyproxy/envoy:distroless-v1.36.2

USER 60577:60577
EXPOSE 8080 8443
EXPOSE 8443

CMD ["envoy", "-c", "/etc/envoy/envoy.yaml"]