Skip to content

Commit 57df4cf

Browse files
laveryagithub-actions[bot]
laverya
authored and
github-actions[bot]
committed
Create new Contour version
1 parent 3b14d27 commit 57df4cf

10 files changed

+9497
-1
lines changed

Diff for: ‎addons/contour/1.30.2/Manifest

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
image envoy docker.io/envoyproxy/envoy:v1.31.5
2+
image contour ghcr.io/projectcontour/contour:v1.30.2

Diff for: ‎addons/contour/1.30.2/contour.yaml

+9,199
Large diffs are not rendered by default.

Diff for: ‎addons/contour/1.30.2/install.sh

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
function contour_pre_init() {
3+
if [ -z "$CONTOUR_NAMESPACE" ]; then
4+
CONTOUR_NAMESPACE=projectcontour
5+
fi
6+
7+
if [ -z "$CONTOUR_TLS_MINIMUM_PROTOCOL_VERSION" ]; then
8+
CONTOUR_TLS_MINIMUM_PROTOCOL_VERSION="1.2"
9+
fi
10+
11+
if [ -z "$CONTOUR_HTTP_PORT" ]; then
12+
CONTOUR_HTTP_PORT="80"
13+
fi
14+
15+
if [ -z "$CONTOUR_HTTPS_PORT" ]; then
16+
CONTOUR_HTTPS_PORT="443"
17+
fi
18+
}
19+
20+
function contour() {
21+
local src="$DIR/addons/contour/1.30.2"
22+
local dst="$DIR/kustomize/contour"
23+
24+
cp "$src/contour.yaml" "$dst/"
25+
cp "$src/patches/job-image.yaml" "$dst/"
26+
cp "$src/patches/resource-limits.yaml" "$dst/"
27+
28+
render_yaml_file "$src/tmpl-configmap.yaml" > "$dst/configmap.yaml"
29+
render_yaml_file "$src/tmpl-kustomization.yaml" > "$dst/kustomization.yaml"
30+
render_yaml_file "$src/tmpl-namespace.yaml" > "$dst/namespace.yaml"
31+
render_yaml_file "$src/tmpl-service-patch.yaml" > "$dst/service-patch.yaml"
32+
33+
# NodePort services in old namespace conflict
34+
if kubectl get namespace heptio-contour &>/dev/null && [ "$CONTOUR_NAMESPACE" != heptio-contour ]; then
35+
kubectl delete namespace heptio-contour
36+
fi
37+
38+
kubectl create --save-config namespace "$CONTOUR_NAMESPACE" 2>/dev/null || true
39+
40+
kubectl apply -k "$dst/"
41+
42+
printf "awaiting contour deployment\n"
43+
spinner_until 300 deployment_fully_updated projectcontour contour
44+
printf "awaiting envoy daemonset\n"
45+
spinner_until 300 daemonset_fully_updated projectcontour envoy
46+
}

Diff for: ‎addons/contour/1.30.2/patches/job-image.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
apiVersion: batch/v1
3+
kind: Job
4+
metadata:
5+
name: contour-certgen-v1-30-2
6+
namespace: projectcontour
7+
spec:
8+
template:
9+
spec:
10+
containers:
11+
- name: contour
12+
imagePullPolicy: IfNotPresent

Diff for: ‎addons/contour/1.30.2/patches/resource-limits.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: apps/v1
3+
kind: DaemonSet
4+
metadata:
5+
name: envoy
6+
namespace: projectcontour
7+
spec:
8+
template:
9+
spec:
10+
containers:
11+
- name: envoy
12+
resources:
13+
limits:
14+
cpu: "0.4"
15+
requests:
16+
cpu: "0.03"

Diff for: ‎addons/contour/1.30.2/tmpl-configmap.yaml

+187
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: contour
6+
namespace: projectcontour
7+
data:
8+
contour.yaml: |
9+
#
10+
# server:
11+
# determine which XDS Server implementation to utilize in Contour.
12+
# xds-server-type: envoy
13+
#
14+
# Specify the Gateway API configuration.
15+
# gateway:
16+
# namespace: projectcontour
17+
# name: contour
18+
#
19+
# should contour expect to be running inside a k8s cluster
20+
# incluster: true
21+
#
22+
# path to kubeconfig (if not running inside a k8s cluster)
23+
# kubeconfig: /path/to/.kube/config
24+
#
25+
# Disable RFC-compliant behavior to strip "Content-Length" header if
26+
# "Tranfer-Encoding: chunked" is also set.
27+
# disableAllowChunkedLength: false
28+
#
29+
# Disable Envoy's non-standard merge_slashes path transformation option
30+
# that strips duplicate slashes from request URLs.
31+
# disableMergeSlashes: false
32+
#
33+
# Disable HTTPProxy permitInsecure field
34+
disablePermitInsecure: false
35+
tls:
36+
# minimum TLS version that Contour will negotiate
37+
minimum-protocol-version: "$CONTOUR_TLS_MINIMUM_PROTOCOL_VERSION"
38+
# TLS ciphers to be supported by Envoy TLS listeners when negotiating
39+
# TLS 1.2.
40+
# cipher-suites:
41+
# - '[ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]'
42+
# - '[ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]'
43+
# - 'ECDHE-ECDSA-AES256-GCM-SHA384'
44+
# - 'ECDHE-RSA-AES256-GCM-SHA384'
45+
# Defines the Kubernetes name/namespace matching a secret to use
46+
# as the fallback certificate when requests which don't match the
47+
# SNI defined for a vhost.
48+
fallback-certificate:
49+
# name: fallback-secret-name
50+
# namespace: projectcontour
51+
envoy-client-certificate:
52+
# name: envoy-client-cert-secret-name
53+
# namespace: projectcontour
54+
####
55+
# ExternalName Services are disabled by default due to CVE-2021-XXXXX
56+
# You can re-enable them by setting this setting to `true`.
57+
# This is not recommended without understanding the security implications.
58+
# Please see the advisory at https://github.com/projectcontour/contour/security/advisories/GHSA-5ph6-qq5x-7jwc for the details.
59+
# enableExternalNameService: false
60+
##
61+
# Address to be placed in status.loadbalancer field of Ingress objects.
62+
# May be either a literal IP address or a host name.
63+
# The value will be placed directly into the relevant field inside the status.loadBalancer struct.
64+
# ingress-status-address: local.projectcontour.io
65+
### Logging options
66+
# Default setting
67+
accesslog-format: envoy
68+
# The default access log format is defined by Envoy but it can be customized by setting following variable.
69+
# accesslog-format-string: "...\n"
70+
# To enable JSON logging in Envoy
71+
# accesslog-format: json
72+
# accesslog-level: info
73+
# The default fields that will be logged are specified below.
74+
# To customise this list, just add or remove entries.
75+
# The canonical list is available at
76+
# https://godoc.org/github.com/projectcontour/contour/internal/envoy#JSONFields
77+
# json-fields:
78+
# - "@timestamp"
79+
# - "authority"
80+
# - "bytes_received"
81+
# - "bytes_sent"
82+
# - "downstream_local_address"
83+
# - "downstream_remote_address"
84+
# - "duration"
85+
# - "method"
86+
# - "path"
87+
# - "protocol"
88+
# - "request_id"
89+
# - "requested_server_name"
90+
# - "response_code"
91+
# - "response_flags"
92+
# - "uber_trace_id"
93+
# - "upstream_cluster"
94+
# - "upstream_host"
95+
# - "upstream_local_address"
96+
# - "upstream_service_time"
97+
# - "user_agent"
98+
# - "x_forwarded_for"
99+
# - "grpc_status"
100+
# - "grpc_status_number"
101+
#
102+
# default-http-versions:
103+
# - "HTTP/2"
104+
# - "HTTP/1.1"
105+
#
106+
# The following shows the default proxy timeout settings.
107+
# timeouts:
108+
# request-timeout: infinity
109+
# connection-idle-timeout: 60s
110+
# stream-idle-timeout: 5m
111+
# max-connection-duration: infinity
112+
# delayed-close-timeout: 1s
113+
# connection-shutdown-grace-period: 5s
114+
# connect-timeout: 2s
115+
#
116+
# Envoy cluster settings.
117+
# cluster:
118+
# configure the cluster dns lookup family
119+
# valid options are: auto (default), v4, v6
120+
# dns-lookup-family: auto
121+
#
122+
# Envoy network settings.
123+
# network:
124+
# Configure the number of additional ingress proxy hops from the
125+
# right side of the x-forwarded-for HTTP header to trust.
126+
# num-trusted-hops: 0
127+
# Configure the port used to access the Envoy Admin interface.
128+
# admin-port: 9001
129+
#
130+
# Configure an optional global rate limit service.
131+
# rateLimitService:
132+
# Identifies the extension service defining the rate limit service,
133+
# formatted as <namespace>/<name>.
134+
# extensionService: projectcontour/ratelimit
135+
# Defines the rate limit domain to pass to the rate limit service.
136+
# Acts as a container for a set of rate limit definitions within
137+
# the RLS.
138+
# domain: contour
139+
# Defines whether to allow requests to proceed when the rate limit
140+
# service fails to respond with a valid rate limit decision within
141+
# the timeout defined on the extension service.
142+
# failOpen: false
143+
# Defines whether to include the X-RateLimit headers X-RateLimit-Limit,
144+
# X-RateLimit-Remaining, and X-RateLimit-Reset (as defined by the IETF
145+
# Internet-Draft linked below), on responses to clients when the Rate
146+
# Limit Service is consulted for a request.
147+
# ref. https://tools.ietf.org/id/draft-polli-ratelimit-headers-03.html
148+
# enableXRateLimitHeaders: false
149+
# Defines whether to translate status code 429 to grpc code RESOURCE_EXHAUSTED
150+
# instead of the default UNAVAILABLE
151+
# enableResourceExhaustedCode: false
152+
#
153+
# Global Policy settings.
154+
# policy:
155+
# # Default headers to set on all requests (unless set/removed on the HTTPProxy object itself)
156+
# request-headers:
157+
# set:
158+
# # example: the hostname of the Envoy instance that proxied the request
159+
# X-Envoy-Hostname: %HOSTNAME%
160+
# # example: add a l5d-dst-override header to instruct Linkerd what service the request is destined for
161+
# l5d-dst-override: %CONTOUR_SERVICE_NAME%.%CONTOUR_NAMESPACE%.svc.cluster.local:%CONTOUR_SERVICE_PORT%
162+
# # default headers to set on all responses (unless set/removed on the HTTPProxy object itself)
163+
# response-headers:
164+
# set:
165+
# # example: Envoy flags that provide additional details about the response or connection
166+
# X-Envoy-Response-Flags: %RESPONSE_FLAGS%
167+
#
168+
# metrics:
169+
# contour:
170+
# address: 0.0.0.0
171+
# port: 8000
172+
# server-certificate-path: /path/to/server-cert.pem
173+
# server-key-path: /path/to/server-private-key.pem
174+
# ca-certificate-path: /path/to/root-ca-for-client-validation.pem
175+
# envoy:
176+
# address: 0.0.0.0
177+
# port: 8002
178+
# server-certificate-path: /path/to/server-cert.pem
179+
# server-key-path: /path/to/server-private-key.pem
180+
# ca-certificate-path: /path/to/root-ca-for-client-validation.pem
181+
#
182+
# listener:
183+
# connection-balancer: exact
184+
# socket-options:
185+
# tos: 64
186+
# traffic-class: 64
187+

Diff for: ‎addons/contour/1.30.2/tmpl-kustomization.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace: $CONTOUR_NAMESPACE
2+
3+
resources:
4+
- namespace.yaml
5+
- contour.yaml
6+
- configmap.yaml
7+
8+
patchesStrategicMerge:
9+
- service-patch.yaml
10+
- job-image.yaml
11+
- resource-limits.yaml

Diff for: ‎addons/contour/1.30.2/tmpl-namespace.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: $CONTOUR_NAMESPACE

Diff for: ‎addons/contour/1.30.2/tmpl-service-patch.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: envoy
6+
namespace: projectcontour
7+
spec:
8+
type: NodePort
9+
ports:
10+
- port: 80
11+
nodePort: $CONTOUR_HTTP_PORT
12+
name: http
13+
protocol: TCP
14+
targetPort: 8080
15+
- port: 443
16+
nodePort: $CONTOUR_HTTPS_PORT
17+
name: https
18+
protocol: TCP
19+
targetPort: 8443

Diff for: ‎web/src/installers/versions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ module.exports.InstallerVersions = {
295295
"1.4.3",
296296
"1.0.4-14.2.21",
297297
],
298-
contour: ["1.30.0", "1.29.0", "1.28.3", "1.28.2", "1.27.0", "1.26.1", "1.26.0", "1.25.2", "1.25.0", "1.24.4", "1.24.3", "1.24.2", "1.24.1", "1.24.0", "1.23.2", "1.23.1", "1.23.0", "1.22.1", "1.22.0", "1.21.1", "1.21.0", "1.20.1", "1.20.0", "1.19.1", "1.18.0", "1.16.0", "1.15.1", "1.14.1", "1.14.0", "1.13.1", "1.13.0", "1.12.0", "1.11.0", "1.10.1", "1.7.0", "1.0.1", "0.14.0"], // cron-contour-update
298+
contour: ["1.30.2", "1.30.0", "1.29.0", "1.28.3", "1.28.2", "1.27.0", "1.26.1", "1.26.0", "1.25.2", "1.25.0", "1.24.4", "1.24.3", "1.24.2", "1.24.1", "1.24.0", "1.23.2", "1.23.1", "1.23.0", "1.22.1", "1.22.0", "1.21.1", "1.21.0", "1.20.1", "1.20.0", "1.19.1", "1.18.0", "1.16.0", "1.15.1", "1.14.1", "1.14.0", "1.13.1", "1.13.0", "1.12.0", "1.11.0", "1.10.1", "1.7.0", "1.0.1", "0.14.0"], // cron-contour-update
299299
registry: [
300300
// cron-registry-update
301301
"2.8.3",

0 commit comments

Comments
 (0)