diff --git a/config/contour/external.yaml b/config/contour/external.yaml index a868ff947..1579bbc2a 100644 --- a/config/contour/external.yaml +++ b/config/contour/external.yaml @@ -48,11 +48,12 @@ data: # # server: # determine which XDS Server implementation to utilize in Contour. - # xds-server-type: contour + # xds-server-type: envoy # # Specify the Gateway API configuration. # gateway: - # controllerName: projectcontour.io/gateway-controller + # namespace: contour-external + # name: contour # # should contour expect to be running inside a k8s cluster # incluster: true @@ -227,7 +228,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: contourconfigurations.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -811,9 +812,9 @@ spec: description: |- FeatureFlags defines toggle to enable new contour features. Available toggles are: - useEndpointSlices - configures contour to fetch endpoint data - from k8s endpoint slices. defaults to false and reading endpoint - data from the k8s endpoints. + useEndpointSlices - Configures contour to fetch endpoint data + from k8s endpoint slices. defaults to true, + If false then reads endpoint data from the k8s endpoints. items: type: string type: array @@ -822,22 +823,10 @@ spec: Gateway contains parameters for the gateway-api Gateway that Contour is configured to serve traffic. properties: - controllerName: - description: |- - ControllerName is used to determine whether Contour should reconcile a - GatewayClass. The string takes the form of "projectcontour.io//contour". - If unset, the gatewayclass controller will not be started. - Exactly one of ControllerName or GatewayRef must be set. - Deprecated: users should use GatewayRef, or the Gateway provisioner, - in place of this field. This field will be removed in a future release. - type: string gatewayRef: description: |- - GatewayRef defines a specific Gateway that this Contour - instance corresponds to. If set, Contour will reconcile - only this gateway, and will not reconcile any gateway - classes. - Exactly one of ControllerName or GatewayRef must be set. + GatewayRef defines the specific Gateway that this Contour + instance corresponds to. properties: name: type: string @@ -847,6 +836,8 @@ spec: - name - namespace type: object + required: + - gatewayRef type: object globalExtAuth: description: |- @@ -1341,7 +1332,7 @@ spec: type: description: |- Defines the XDSServer to use for `contour serve`. - Values: `contour` (default), `envoy`. + Values: `envoy` (default), `contour (deprecated)`. Other values will produce an error. type: string type: object @@ -1557,7 +1548,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: contourdeployments.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -2003,6 +1994,8 @@ spec: to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. + When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified + (which defaults to None). type: string name: description: This must match the Name of a Volume. @@ -2012,6 +2005,21 @@ spec: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. type: boolean + recursiveReadOnly: + description: |- + RecursiveReadOnly specifies whether read-only mounts should be handled + recursively. + If ReadOnly is false, this field has no meaning and must be unspecified. + If ReadOnly is true, and this field is set to Disabled, the mount is not made + recursively read-only. If this field is set to IfPossible, the mount is made + recursively read-only, if it is supported by the container runtime. If this + field is set to Enabled, the mount is made recursively read-only if it is + supported by the container runtime, otherwise the pod will not be started and + an error will be generated to indicate the reason. + If this field is set to IfPossible or Enabled, MountPropagation must be set to + None (or be unspecified, which defaults to None). + If this field is not specified, it is treated as an equivalent of Disabled. + type: string subPath: description: |- Path within the volume from which the container's volume should be mounted. @@ -2127,6 +2135,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic path: description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /' type: string @@ -2252,6 +2261,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -2329,7 +2339,7 @@ spec: description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' + description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.' properties: apiVersion: description: Version of the schema the FieldPath is written in terms of, defaults to "v1". @@ -2380,6 +2390,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic type: object emptyDir: description: |- @@ -2471,6 +2482,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -2607,11 +2619,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -2639,7 +2653,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -2679,6 +2693,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic wwids: description: |- wwids Optional: FC volume world wide identifiers (wwids) @@ -2686,6 +2701,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object flexVolume: description: |- @@ -2898,6 +2914,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic readOnly: description: |- readOnly here will force the ReadOnly setting in VolumeMounts. @@ -3071,11 +3088,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -3151,6 +3170,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -3171,7 +3191,7 @@ spec: description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' + description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.' properties: apiVersion: description: Version of the schema the FieldPath is written in terms of, defaults to "v1". @@ -3222,6 +3242,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic type: object secret: description: secret information about the secret data to project @@ -3263,6 +3284,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -3304,6 +3326,7 @@ spec: type: object type: object type: array + x-kubernetes-list-type: atomic type: object quobyte: description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime @@ -3372,6 +3395,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic pool: description: |- pool is the rados pool name. @@ -3520,6 +3544,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic optional: description: optional field specify whether the Secret or its keys must be defined type: boolean @@ -4353,9 +4378,9 @@ spec: description: |- FeatureFlags defines toggle to enable new contour features. Available toggles are: - useEndpointSlices - configures contour to fetch endpoint data - from k8s endpoint slices. defaults to false and reading endpoint - data from the k8s endpoints. + useEndpointSlices - Configures contour to fetch endpoint data + from k8s endpoint slices. defaults to true, + If false then reads endpoint data from the k8s endpoints. items: type: string type: array @@ -4364,22 +4389,10 @@ spec: Gateway contains parameters for the gateway-api Gateway that Contour is configured to serve traffic. properties: - controllerName: - description: |- - ControllerName is used to determine whether Contour should reconcile a - GatewayClass. The string takes the form of "projectcontour.io//contour". - If unset, the gatewayclass controller will not be started. - Exactly one of ControllerName or GatewayRef must be set. - Deprecated: users should use GatewayRef, or the Gateway provisioner, - in place of this field. This field will be removed in a future release. - type: string gatewayRef: description: |- - GatewayRef defines a specific Gateway that this Contour - instance corresponds to. If set, Contour will reconcile - only this gateway, and will not reconcile any gateway - classes. - Exactly one of ControllerName or GatewayRef must be set. + GatewayRef defines the specific Gateway that this Contour + instance corresponds to. properties: name: type: string @@ -4389,6 +4402,8 @@ spec: - name - namespace type: object + required: + - gatewayRef type: object globalExtAuth: description: |- @@ -4883,7 +4898,7 @@ spec: type: description: |- Defines the XDSServer to use for `contour serve`. - Values: `contour` (default), `envoy`. + Values: `envoy` (default), `contour (deprecated)`. Other values will produce an error. type: string type: object @@ -4967,7 +4982,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: extensionservices.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -5410,7 +5425,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: httpproxies.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -8148,6 +8163,7 @@ spec: x-kubernetes-list-type: atomic type: object type: array + x-kubernetes-list-type: atomic type: object type: object required: @@ -8163,7 +8179,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: tlscertificatedelegations.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -8491,7 +8507,7 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-v1-28-3 + name: contour-certgen-v1-29-0 namespace: contour-external labels: networking.knative.dev/ingress-provider: contour @@ -8503,7 +8519,7 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent command: - contour @@ -8749,7 +8765,7 @@ spec: - --config-path=/config/contour.yaml command: - contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent name: contour ports: @@ -8837,7 +8853,7 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -8865,7 +8881,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.29.3 + image: docker.io/envoyproxy/envoy:v1.30.1 imagePullPolicy: IfNotPresent name: envoy env: @@ -8927,7 +8943,7 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: diff --git a/config/contour/internal.yaml b/config/contour/internal.yaml index b7a91b7b7..cc19816db 100644 --- a/config/contour/internal.yaml +++ b/config/contour/internal.yaml @@ -48,11 +48,12 @@ data: # # server: # determine which XDS Server implementation to utilize in Contour. - # xds-server-type: contour + # xds-server-type: envoy # # Specify the Gateway API configuration. # gateway: - # controllerName: projectcontour.io/gateway-controller + # namespace: contour-internal + # name: contour # # should contour expect to be running inside a k8s cluster # incluster: true @@ -227,7 +228,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: contourconfigurations.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -811,9 +812,9 @@ spec: description: |- FeatureFlags defines toggle to enable new contour features. Available toggles are: - useEndpointSlices - configures contour to fetch endpoint data - from k8s endpoint slices. defaults to false and reading endpoint - data from the k8s endpoints. + useEndpointSlices - Configures contour to fetch endpoint data + from k8s endpoint slices. defaults to true, + If false then reads endpoint data from the k8s endpoints. items: type: string type: array @@ -822,22 +823,10 @@ spec: Gateway contains parameters for the gateway-api Gateway that Contour is configured to serve traffic. properties: - controllerName: - description: |- - ControllerName is used to determine whether Contour should reconcile a - GatewayClass. The string takes the form of "projectcontour.io//contour". - If unset, the gatewayclass controller will not be started. - Exactly one of ControllerName or GatewayRef must be set. - Deprecated: users should use GatewayRef, or the Gateway provisioner, - in place of this field. This field will be removed in a future release. - type: string gatewayRef: description: |- - GatewayRef defines a specific Gateway that this Contour - instance corresponds to. If set, Contour will reconcile - only this gateway, and will not reconcile any gateway - classes. - Exactly one of ControllerName or GatewayRef must be set. + GatewayRef defines the specific Gateway that this Contour + instance corresponds to. properties: name: type: string @@ -847,6 +836,8 @@ spec: - name - namespace type: object + required: + - gatewayRef type: object globalExtAuth: description: |- @@ -1341,7 +1332,7 @@ spec: type: description: |- Defines the XDSServer to use for `contour serve`. - Values: `contour` (default), `envoy`. + Values: `envoy` (default), `contour (deprecated)`. Other values will produce an error. type: string type: object @@ -1557,7 +1548,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: contourdeployments.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -2003,6 +1994,8 @@ spec: to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. + When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified + (which defaults to None). type: string name: description: This must match the Name of a Volume. @@ -2012,6 +2005,21 @@ spec: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. type: boolean + recursiveReadOnly: + description: |- + RecursiveReadOnly specifies whether read-only mounts should be handled + recursively. + If ReadOnly is false, this field has no meaning and must be unspecified. + If ReadOnly is true, and this field is set to Disabled, the mount is not made + recursively read-only. If this field is set to IfPossible, the mount is made + recursively read-only, if it is supported by the container runtime. If this + field is set to Enabled, the mount is made recursively read-only if it is + supported by the container runtime, otherwise the pod will not be started and + an error will be generated to indicate the reason. + If this field is set to IfPossible or Enabled, MountPropagation must be set to + None (or be unspecified, which defaults to None). + If this field is not specified, it is treated as an equivalent of Disabled. + type: string subPath: description: |- Path within the volume from which the container's volume should be mounted. @@ -2127,6 +2135,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic path: description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /' type: string @@ -2252,6 +2261,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -2329,7 +2339,7 @@ spec: description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' + description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.' properties: apiVersion: description: Version of the schema the FieldPath is written in terms of, defaults to "v1". @@ -2380,6 +2390,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic type: object emptyDir: description: |- @@ -2471,6 +2482,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -2607,11 +2619,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -2639,7 +2653,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -2679,6 +2693,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic wwids: description: |- wwids Optional: FC volume world wide identifiers (wwids) @@ -2686,6 +2701,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object flexVolume: description: |- @@ -2898,6 +2914,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic readOnly: description: |- readOnly here will force the ReadOnly setting in VolumeMounts. @@ -3071,11 +3088,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -3151,6 +3170,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -3171,7 +3191,7 @@ spec: description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' + description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.' properties: apiVersion: description: Version of the schema the FieldPath is written in terms of, defaults to "v1". @@ -3222,6 +3242,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic type: object secret: description: secret information about the secret data to project @@ -3263,6 +3284,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic name: description: |- Name of the referent. @@ -3304,6 +3326,7 @@ spec: type: object type: object type: array + x-kubernetes-list-type: atomic type: object quobyte: description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime @@ -3372,6 +3395,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic pool: description: |- pool is the rados pool name. @@ -3520,6 +3544,7 @@ spec: - path type: object type: array + x-kubernetes-list-type: atomic optional: description: optional field specify whether the Secret or its keys must be defined type: boolean @@ -4353,9 +4378,9 @@ spec: description: |- FeatureFlags defines toggle to enable new contour features. Available toggles are: - useEndpointSlices - configures contour to fetch endpoint data - from k8s endpoint slices. defaults to false and reading endpoint - data from the k8s endpoints. + useEndpointSlices - Configures contour to fetch endpoint data + from k8s endpoint slices. defaults to true, + If false then reads endpoint data from the k8s endpoints. items: type: string type: array @@ -4364,22 +4389,10 @@ spec: Gateway contains parameters for the gateway-api Gateway that Contour is configured to serve traffic. properties: - controllerName: - description: |- - ControllerName is used to determine whether Contour should reconcile a - GatewayClass. The string takes the form of "projectcontour.io//contour". - If unset, the gatewayclass controller will not be started. - Exactly one of ControllerName or GatewayRef must be set. - Deprecated: users should use GatewayRef, or the Gateway provisioner, - in place of this field. This field will be removed in a future release. - type: string gatewayRef: description: |- - GatewayRef defines a specific Gateway that this Contour - instance corresponds to. If set, Contour will reconcile - only this gateway, and will not reconcile any gateway - classes. - Exactly one of ControllerName or GatewayRef must be set. + GatewayRef defines the specific Gateway that this Contour + instance corresponds to. properties: name: type: string @@ -4389,6 +4402,8 @@ spec: - name - namespace type: object + required: + - gatewayRef type: object globalExtAuth: description: |- @@ -4883,7 +4898,7 @@ spec: type: description: |- Defines the XDSServer to use for `contour serve`. - Values: `contour` (default), `envoy`. + Values: `envoy` (default), `contour (deprecated)`. Other values will produce an error. type: string type: object @@ -4967,7 +4982,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: extensionservices.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -5410,7 +5425,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: httpproxies.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -8148,6 +8163,7 @@ spec: x-kubernetes-list-type: atomic type: object type: array + x-kubernetes-list-type: atomic type: object type: object required: @@ -8163,7 +8179,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: tlscertificatedelegations.projectcontour.io labels: networking.knative.dev/ingress-provider: contour @@ -8491,7 +8507,7 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-v1-28-3 + name: contour-certgen-v1-29-0 namespace: contour-internal labels: networking.knative.dev/ingress-provider: contour @@ -8503,7 +8519,7 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent command: - contour @@ -8748,7 +8764,7 @@ spec: - --config-path=/config/contour.yaml command: - contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent name: contour ports: @@ -8836,7 +8852,7 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -8864,7 +8880,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.29.3 + image: docker.io/envoyproxy/envoy:v1.30.1 imagePullPolicy: IfNotPresent name: envoy env: @@ -8926,7 +8942,7 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:v1.28.3 + image: ghcr.io/projectcontour/contour:v1.29.0 imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: diff --git a/go.mod b/go.mod index 4a1bebd3f..681a314bf 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,23 @@ module knative.dev/net-contour -go 1.21 +go 1.22.0 + +replace ( + k8s.io/api => k8s.io/api v0.29.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3 // indirect + k8s.io/apimachinery => k8s.io/apimachinery v0.29.3 + k8s.io/client-go => k8s.io/client-go v0.29.3 + k8s.io/code-generator => k8s.io/code-generator v0.29.3 // indirect + k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect +) require ( github.com/google/go-cmp v0.6.0 - github.com/projectcontour/contour v1.28.3 + github.com/projectcontour/contour v1.29.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.3 - k8s.io/apimachinery v0.29.3 - k8s.io/client-go v0.29.3 + k8s.io/api v0.30.0 + k8s.io/apimachinery v0.30.0 + k8s.io/client-go v0.30.0 knative.dev/hack v0.0.0-20240507013718-68e3bfb39d11 knative.dev/networking v0.0.0-20240515132013-4e598f42f4c2 knative.dev/pkg v0.0.0-20240515073057-11a3d46fe4d6 @@ -53,7 +62,7 @@ require ( github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.19.1 // indirect - github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect @@ -81,11 +90,11 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.29.3 // indirect + k8s.io/apiextensions-apiserver v0.30.0 // indirect k8s.io/code-generator v0.29.3 // indirect k8s.io/gengo v0.0.0-20240129211411-f967bbeff4b4 // indirect k8s.io/klog/v2 v2.120.1 // indirect - k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index 01151afa2..18a4ee8d8 100644 --- a/go.sum +++ b/go.sum @@ -104,7 +104,8 @@ github.com/go-openapi/swag v0.22.7 h1:JWrc1uc/P9cSomxfnsFSVWoE1FW6bNbrVPmpQYpCcR github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -172,8 +173,8 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -233,10 +234,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= -github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -248,8 +249,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/projectcontour/contour v1.28.3 h1:K1/1zwQe0GTZCqRKR1XQN202j670iV9h5XWlc8Fp+9g= -github.com/projectcontour/contour v1.28.3/go.mod h1:DIzYwbwPl64i/oA+DcOXEe/TwN+SlrLciBaioj4W5M0= +github.com/projectcontour/contour v1.29.0 h1:gCrV4/Q8ZEpDRtNqMtAzq8t6K0wYCJkBEKSxxedDZ8g= +github.com/projectcontour/contour v1.29.0/go.mod h1:C5FDDAhjhDK4CufMdysPfYexIzntJBZEqCImwsGP1N0= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -263,8 +264,8 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1: github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= -github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= @@ -305,8 +306,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/hack/update-deps.sh b/hack/update-deps.sh index 8ca5856b9..1732b4a81 100755 --- a/hack/update-deps.sh +++ b/hack/update-deps.sh @@ -20,7 +20,7 @@ set -o pipefail source $(dirname "$0")/../vendor/knative.dev/hack/library.sh -CONTOUR_VERSION="v1.28.3" # This is for controlling which version of contour we want to use. +CONTOUR_VERSION="v1.29.0" # This is for controlling which version of contour we want to use. CLUSTER_ROLE_NAME=knative-contour go get "github.com/projectcontour/contour@${CONTOUR_VERSION}" diff --git a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/detailedconditions.go b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/detailedconditions.go index d7ac6e138..f8c293a5b 100644 --- a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/detailedconditions.go +++ b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/detailedconditions.go @@ -18,28 +18,28 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ConditionStatus is a type alias for the k8s.io/apimachinery/pkg/apis/meta/v1 // ConditionStatus type to maintain API compatibility. // +k8s:deepcopy-gen=false -type ConditionStatus = metav1.ConditionStatus +type ConditionStatus = meta_v1.ConditionStatus // These are valid condition statuses. "ConditionTrue" means a resource is in the condition. // "ConditionFalse" means a resource is not in the condition. "ConditionUnknown" means kubernetes // can't decide if a resource is in the condition or not. In the future, we could add other // intermediate conditions, e.g. ConditionDegraded. These are retained here for API compatibility. const ( - ConditionTrue ConditionStatus = metav1.ConditionTrue - ConditionFalse ConditionStatus = metav1.ConditionFalse - ConditionUnknown ConditionStatus = metav1.ConditionUnknown + ConditionTrue ConditionStatus = meta_v1.ConditionTrue + ConditionFalse ConditionStatus = meta_v1.ConditionFalse + ConditionUnknown ConditionStatus = meta_v1.ConditionUnknown ) // Condition is a type alias for the k8s.io/apimachinery/pkg/apis/meta/v1 // Condition type to maintain API compatibility. // +k8s:deepcopy-gen=false -type Condition = metav1.Condition +type Condition = meta_v1.Condition // SubCondition is a Condition-like type intended for use as a subcondition inside a DetailedCondition. // diff --git a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/httpproxy.go b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/httpproxy.go index 1de37a724..976795d69 100644 --- a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/httpproxy.go +++ b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/httpproxy.go @@ -14,8 +14,8 @@ package v1 import ( - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + core_v1 "k8s.io/api/core/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // HTTPProxySpec defines the spec of the CRD. @@ -1431,7 +1431,7 @@ type HTTPProxyStatus struct { Description string `json:"description,omitempty"` // +optional // LoadBalancer contains the current status of the load balancer. - LoadBalancer corev1.LoadBalancerStatus `json:"loadBalancer,omitempty"` + LoadBalancer core_v1.LoadBalancerStatus `json:"loadBalancer,omitempty"` // +optional // Conditions contains information about the current status of the HTTPProxy, // in an upstream-friendly container. @@ -1464,8 +1464,8 @@ type HTTPProxyStatus struct { // +kubebuilder:resource:scope=Namespaced,path=httpproxies,shortName=proxy;proxies,singular=httpproxy // +kubebuilder:subresource:status type HTTPProxy struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata"` + meta_v1.TypeMeta `json:",inline"` + meta_v1.ObjectMeta `json:"metadata"` Spec HTTPProxySpec `json:"spec"` // Status is a container for computed information about the HTTPProxy. @@ -1478,9 +1478,9 @@ type HTTPProxy struct { // HTTPProxyList is a list of HTTPProxies. type HTTPProxyList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata"` - Items []HTTPProxy `json:"items"` + meta_v1.TypeMeta `json:",inline"` + meta_v1.ListMeta `json:"metadata"` + Items []HTTPProxy `json:"items"` } // SlowStartPolicy will gradually increase amount of traffic to a newly added endpoint. diff --git a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/register.go b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/register.go index 3014e9357..07c34e16f 100644 --- a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/register.go +++ b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/register.go @@ -14,7 +14,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -49,7 +49,7 @@ func AddKnownTypes(scheme *runtime.Scheme) error { &TLSCertificateDelegation{}, &TLSCertificateDelegationList{}, ) - metav1.AddToGroupVersion(scheme, GroupVersion) + meta_v1.AddToGroupVersion(scheme, GroupVersion) return nil } diff --git a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/tlscertificatedelegation.go b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/tlscertificatedelegation.go index 3623defbf..c80b5a393 100644 --- a/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/tlscertificatedelegation.go +++ b/vendor/github.com/projectcontour/contour/apis/projectcontour/v1/tlscertificatedelegation.go @@ -14,7 +14,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // TLSCertificateDelegationSpec defines the spec of the CRD @@ -68,8 +68,8 @@ type TLSCertificateDelegationStatus struct { // +kubebuilder:resource:scope=Namespaced,path=tlscertificatedelegations,shortName=tlscerts,singular=tlscertificatedelegation // +kubebuilder:subresource:status type TLSCertificateDelegation struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata"` + meta_v1.TypeMeta `json:",inline"` + meta_v1.ObjectMeta `json:"metadata"` Spec TLSCertificateDelegationSpec `json:"spec"` // +optional @@ -80,7 +80,7 @@ type TLSCertificateDelegation struct { // TLSCertificateDelegationList is a list of TLSCertificateDelegations. type TLSCertificateDelegationList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata"` - Items []TLSCertificateDelegation `json:"items"` + meta_v1.TypeMeta `json:",inline"` + meta_v1.ListMeta `json:"metadata"` + Items []TLSCertificateDelegation `json:"items"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3d6288fe0..97079543d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -138,15 +138,15 @@ github.com/openzipkin/zipkin-go/model # github.com/pkg/errors v0.9.1 ## explicit github.com/pkg/errors -# github.com/projectcontour/contour v1.28.3 -## explicit; go 1.21 +# github.com/projectcontour/contour v1.29.0 +## explicit; go 1.22.0 github.com/projectcontour/contour/apis/projectcontour/v1 # github.com/prometheus/client_golang v1.19.1 ## explicit; go 1.20 github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp -# github.com/prometheus/client_model v0.6.0 +# github.com/prometheus/client_model v0.6.1 ## explicit; go 1.19 github.com/prometheus/client_model/go # github.com/prometheus/common v0.53.0 @@ -386,7 +386,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.3 +# k8s.io/api v0.30.0 => k8s.io/api v0.29.3 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admissionregistration/v1 @@ -441,11 +441,11 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.29.3 +# k8s.io/apiextensions-apiserver v0.30.0 => k8s.io/apiextensions-apiserver v0.29.3 ## explicit; go 1.21 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -# k8s.io/apimachinery v0.29.3 +# k8s.io/apimachinery v0.30.0 => k8s.io/apimachinery v0.29.3 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -495,7 +495,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.29.3 +# k8s.io/client-go v0.30.0 => k8s.io/client-go v0.29.3 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -802,7 +802,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.29.3 +# k8s.io/code-generator v0.29.3 => k8s.io/code-generator v0.29.3 ## explicit; go 1.21 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -861,7 +861,7 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 +# k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 => k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 ## explicit; go 1.19 k8s.io/kube-openapi/cmd/openapi-gen/args k8s.io/kube-openapi/pkg/cached @@ -1021,3 +1021,9 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 +# k8s.io/api => k8s.io/api v0.29.3 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3 +# k8s.io/apimachinery => k8s.io/apimachinery v0.29.3 +# k8s.io/client-go => k8s.io/client-go v0.29.3 +# k8s.io/code-generator => k8s.io/code-generator v0.29.3 +# k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022