Skip to content

Commit

Permalink
bump contour to 1.30.1 (#1149)
Browse files Browse the repository at this point in the history 
* adjust linter settings

* bump contour

* drop new hostPort on 8002
  • Loading branch information
@dprotaso
dprotaso authored Jan 10, 2025
1 parent 4da052c commit 2f97943
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 49 deletions.
25 changes: 21 additions & 4 deletions .golangci.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
run:
timeout: 5m
timeout: 10m
allow-parallel-runners: true

build-tags:
- e2e
Expand All @@ -8,14 +9,21 @@ run:
- preupgrade
- postupgrade
- postdowngrade
- istio

skip-dirs:
exclude-dirs:
- pkg/client

skip-files:
exclude-files:
- ".pb.go$"

output:
uniq-by-line: true
sort-results: true
sort-order:
- linter
- file
show-stats: true

linters:
enable:
- asciicheck
Expand All @@ -30,12 +38,21 @@ linters:
disable:
- errcheck

linters-settings:
revive:
rules:
# use unparam linter instead - defaults are better
- name: unused-parameter
disabled: true

issues:
exclude-rules:
- path: test # Excludes /test, *_test.go etc.
linters:
- gosec
- unparam
- noctx
- dot-imports

# Allow source and sink receivers in conversion code for clarity.
- path: _conversion\.go
Expand Down
66 changes: 53 additions & 13 deletions config/contour/external.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,12 @@ spec:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
dnsLookupFamily:
description: |-
Expand Down Expand Up @@ -1334,6 +1340,8 @@ spec:
Defines the XDSServer to use for `contour serve`.
Values: `envoy` (default), `contour (deprecated)`.
Other values will produce an error.
Deprecated: this field will be removed in a future release when
the `contour` xDS server implementation is removed.
type: string
type: object
type: object
Expand Down Expand Up @@ -3960,6 +3968,12 @@ spec:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
dnsLookupFamily:
description: |-
Expand Down Expand Up @@ -4955,6 +4969,8 @@ spec:
Defines the XDSServer to use for `contour serve`.
Values: `envoy` (default), `contour (deprecated)`.
Other values will produce an error.
Deprecated: this field will be removed in a future release when
the `contour` xDS server implementation is removed.
type: string
type: object
type: object
Expand Down Expand Up @@ -5083,6 +5099,34 @@ spec:
spec:
description: ExtensionServiceSpec defines the desired state of an ExtensionService resource.
properties:
circuitBreakerPolicy:
description: |-
CircuitBreakerPolicy specifies the circuit breaker budget across the extension service.
If defined this overrides the global circuit breaker budget.
properties:
maxConnections:
description: The maximum number of connections that a single Envoy instance allows to the Kubernetes Service; defaults to 1024.
format: int32
type: integer
maxPendingRequests:
description: The maximum number of pending requests that a single Envoy instance allows to the Kubernetes Service; defaults to 1024.
format: int32
type: integer
maxRequests:
description: The maximum parallel requests a single Envoy instance allows to the Kubernetes Service; defaults to 1024
format: int32
type: integer
maxRetries:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
loadBalancerPolicy:
description: |-
The policy for load balancing GRPC service requests. Note that the
Expand Down Expand Up @@ -8562,7 +8606,7 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-v1-29-1
name: contour-certgen-v1-30-1
namespace: contour-external
labels:
networking.knative.dev/ingress-provider: contour
Expand All @@ -8574,7 +8618,7 @@ spec:
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
command:
- contour
Expand Down Expand Up @@ -8792,9 +8836,6 @@ spec:
app: contour
template:
metadata:
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8000"
labels:
app: contour
spec:
Expand All @@ -8820,7 +8861,7 @@ spec:
- --config-path=/config/contour.yaml
command:
- contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
name: contour
ports:
Expand Down Expand Up @@ -8895,10 +8936,6 @@ spec:
app: envoy
template:
metadata:
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8002"
prometheus.io/path: /stats/prometheus
labels:
app: envoy
spec:
Expand All @@ -8908,7 +8945,7 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -8936,7 +8973,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.30.2
image: docker.io/envoyproxy/envoy:v1.31.3
imagePullPolicy: IfNotPresent
name: envoy
env:
Expand All @@ -8957,6 +8994,9 @@ spec:
- containerPort: 8443
name: https
protocol: TCP
- containerPort: 8002
name: metrics
protocol: TCP
readinessProbe:
httpGet:
path: /ready
Expand Down Expand Up @@ -8998,7 +9038,7 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
Expand Down
66 changes: 53 additions & 13 deletions config/contour/internal.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,12 @@ spec:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
dnsLookupFamily:
description: |-
Expand Down Expand Up @@ -1334,6 +1340,8 @@ spec:
Defines the XDSServer to use for `contour serve`.
Values: `envoy` (default), `contour (deprecated)`.
Other values will produce an error.
Deprecated: this field will be removed in a future release when
the `contour` xDS server implementation is removed.
type: string
type: object
type: object
Expand Down Expand Up @@ -3960,6 +3968,12 @@ spec:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
dnsLookupFamily:
description: |-
Expand Down Expand Up @@ -4955,6 +4969,8 @@ spec:
Defines the XDSServer to use for `contour serve`.
Values: `envoy` (default), `contour (deprecated)`.
Other values will produce an error.
Deprecated: this field will be removed in a future release when
the `contour` xDS server implementation is removed.
type: string
type: object
type: object
Expand Down Expand Up @@ -5083,6 +5099,34 @@ spec:
spec:
description: ExtensionServiceSpec defines the desired state of an ExtensionService resource.
properties:
circuitBreakerPolicy:
description: |-
CircuitBreakerPolicy specifies the circuit breaker budget across the extension service.
If defined this overrides the global circuit breaker budget.
properties:
maxConnections:
description: The maximum number of connections that a single Envoy instance allows to the Kubernetes Service; defaults to 1024.
format: int32
type: integer
maxPendingRequests:
description: The maximum number of pending requests that a single Envoy instance allows to the Kubernetes Service; defaults to 1024.
format: int32
type: integer
maxRequests:
description: The maximum parallel requests a single Envoy instance allows to the Kubernetes Service; defaults to 1024
format: int32
type: integer
maxRetries:
description: The maximum number of parallel retries a single Envoy instance allows to the Kubernetes Service; defaults to 3.
format: int32
type: integer
perHostMaxConnections:
description: |-
PerHostMaxConnections is the maximum number of connections
that Envoy will allow to each individual host in a cluster.
format: int32
type: integer
type: object
loadBalancerPolicy:
description: |-
The policy for load balancing GRPC service requests. Note that the
Expand Down Expand Up @@ -8562,7 +8606,7 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-v1-29-1
name: contour-certgen-v1-30-1
namespace: contour-internal
labels:
networking.knative.dev/ingress-provider: contour
Expand All @@ -8574,7 +8618,7 @@ spec:
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
command:
- contour
Expand Down Expand Up @@ -8791,9 +8835,6 @@ spec:
app: contour
template:
metadata:
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8000"
labels:
app: contour
spec:
Expand All @@ -8819,7 +8860,7 @@ spec:
- --config-path=/config/contour.yaml
command:
- contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
name: contour
ports:
Expand Down Expand Up @@ -8894,10 +8935,6 @@ spec:
app: envoy
template:
metadata:
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8002"
prometheus.io/path: /stats/prometheus
labels:
app: envoy
spec:
Expand All @@ -8907,7 +8944,7 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -8935,7 +8972,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.30.2
image: docker.io/envoyproxy/envoy:v1.31.3
imagePullPolicy: IfNotPresent
name: envoy
env:
Expand All @@ -8956,6 +8993,9 @@ spec:
- containerPort: 8443
name: https
protocol: TCP
- containerPort: 8002
name: metrics
protocol: TCP
readinessProbe:
httpGet:
path: /ready
Expand Down Expand Up @@ -8997,7 +9037,7 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:v1.29.1
image: ghcr.io/projectcontour/contour:v1.30.1
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
Expand Down
Loading

0 comments on commit 2f97943

Please sign in to comment.