From 6d90f54936866c0bc720c6182ffd6990affe729a Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 20 Jun 2024 09:16:18 -0400 Subject: [PATCH] Update net-contour nightly (#15339) bumping knative.dev/net-contour 7fc220b...7f0ee73: > 7f0ee73 bump contour and k8s deps (# 1105) > c4d7299 upgrade to latest dependencies (# 1104) Signed-off-by: Knative Automation --- third_party/contour-latest/contour.yaml | 101 +++++++++++++++----- third_party/contour-latest/net-contour.yaml | 12 +-- 2 files changed, 84 insertions(+), 29 deletions(-) diff --git a/third_party/contour-latest/contour.yaml b/third_party/contour-latest/contour.yaml index 00e312a6313c..5df9c08b62ae 100644 --- a/third_party/contour-latest/contour.yaml +++ b/third_party/contour-latest/contour.yaml @@ -2156,10 +2156,15 @@ spec: More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -2195,10 +2200,15 @@ spec: to OpenStack. properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -2263,10 +2273,15 @@ spec: type: array x-kubernetes-list-type: atomic name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string optional: description: optional specify whether the ConfigMap or its keys must be defined @@ -2296,10 +2311,15 @@ spec: secret object contains more than one secret, all secret references are passed. properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -2736,10 +2756,15 @@ spec: scripts. properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -2924,10 +2949,15 @@ spec: description: secretRef is the CHAP Secret for iSCSI target and initiator authentication properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -3172,10 +3202,15 @@ spec: type: array x-kubernetes-list-type: atomic name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string optional: description: optional specify whether the ConfigMap or its keys must be defined @@ -3286,10 +3321,15 @@ spec: type: array x-kubernetes-list-type: atomic name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string optional: description: optional field specify whether the Secret or its key must be defined @@ -3416,10 +3456,15 @@ spec: More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -3460,10 +3505,15 @@ spec: sensitive information. If this is not provided, Login operation will fail. properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -3574,10 +3624,15 @@ spec: credentials. If not specified, default values will be attempted. properties: name: + default: "" description: |- Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. TODO: Add other useful fields. apiVersion, kind, uid? + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896. type: string type: object x-kubernetes-map-type: atomic @@ -8507,7 +8562,7 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-v1-29-0 + name: contour-certgen-v1-29-1 namespace: contour-external labels: networking.knative.dev/ingress-provider: contour @@ -8519,7 +8574,7 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent command: - contour @@ -8765,7 +8820,7 @@ spec: - --config-path=/config/contour.yaml command: - contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent name: contour ports: @@ -8853,7 +8908,7 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -8881,7 +8936,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.1 + image: docker.io/envoyproxy/envoy:v1.30.2 imagePullPolicy: IfNotPresent name: envoy env: @@ -8943,7 +8998,7 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: @@ -9243,7 +9298,7 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-v1-29-0 + name: contour-certgen-v1-29-1 namespace: contour-internal labels: networking.knative.dev/ingress-provider: contour @@ -9255,7 +9310,7 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent command: - contour @@ -9408,7 +9463,7 @@ spec: - --config-path=/config/contour.yaml command: - contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent name: contour ports: @@ -9496,7 +9551,7 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -9524,7 +9579,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.1 + image: docker.io/envoyproxy/envoy:v1.30.2 imagePullPolicy: IfNotPresent name: envoy env: @@ -9586,7 +9641,7 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:v1.29.0 + image: ghcr.io/projectcontour/contour:v1.29.1 imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: diff --git a/third_party/contour-latest/net-contour.yaml b/third_party/contour-latest/net-contour.yaml index f3d0ec88940f..67eff78b6e4b 100644 --- a/third_party/contour-latest/net-contour.yaml +++ b/third_party/contour-latest/net-contour.yaml @@ -8,7 +8,7 @@ metadata: networking.knative.dev/ingress-provider: contour app.kubernetes.io/component: net-contour app.kubernetes.io/name: knative-serving - app.kubernetes.io/version: "20240611-7fc220b5" + app.kubernetes.io/version: "20240620-7f0ee737" serving.knative.dev/controller: "true" rules: - apiGroups: ["projectcontour.io"] @@ -38,7 +38,7 @@ metadata: networking.knative.dev/ingress-provider: contour app.kubernetes.io/component: net-contour app.kubernetes.io/name: knative-serving - app.kubernetes.io/version: "20240611-7fc220b5" + app.kubernetes.io/version: "20240620-7f0ee737" data: _example: | ################################ @@ -111,7 +111,7 @@ metadata: networking.knative.dev/ingress-provider: contour app.kubernetes.io/component: net-contour app.kubernetes.io/name: knative-serving - app.kubernetes.io/version: "20240611-7fc220b5" + app.kubernetes.io/version: "20240620-7f0ee737" spec: replicas: 1 selector: @@ -123,14 +123,14 @@ spec: app: net-contour-controller app.kubernetes.io/component: net-contour app.kubernetes.io/name: knative-serving - app.kubernetes.io/version: "20240611-7fc220b5" + app.kubernetes.io/version: "20240620-7f0ee737" spec: serviceAccountName: controller containers: - name: controller # This is the Go import path for the binary that is containerized # and substituted here. - image: gcr.io/knative-nightly/knative.dev/net-contour/cmd/controller@sha256:a8706eedaed642863e2ae6e2f4d06d0105d1a23baa809ed13bb2f7836b43a071 + image: gcr.io/knative-nightly/knative.dev/net-contour/cmd/controller@sha256:d26bc4a35a5e5b040e736c6995842ab82a540de398465c6c9b7b294386ca2480 resources: requests: cpu: 40m @@ -174,7 +174,7 @@ metadata: networking.knative.dev/ingress-provider: contour app.kubernetes.io/component: net-contour app.kubernetes.io/name: knative-serving - app.kubernetes.io/version: "20240611-7fc220b5" + app.kubernetes.io/version: "20240620-7f0ee737" spec: delegations: - secretName: knative-serving-certs