From 857b045e4b8c0f98cc36be50ca07a32a553786c0 Mon Sep 17 00:00:00 2001 From: Tasdik Rahman Date: Fri, 14 Jun 2024 13:07:33 +0200 Subject: [PATCH 01/28] feat: Allow ability to set mtu in infrav1.NetworkSpec --- api/v1beta1/types.go | 6 ++++++ .../bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml | 7 +++++++ ...nfrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml | 7 +++++++ ...infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml | 7 +++++++ 4 files changed, 27 insertions(+) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index e0d154aa0..957136084 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -136,6 +136,12 @@ type NetworkSpec struct { // HostProject is the name of the project hosting the shared VPC network resources. // +optional HostProject *string `json:"hostProject,omitempty"` + + // Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through + // this interconnect attachment. Only 1440 and 1500 are allowed. If not + // specified, the value will default to 1440. + // +optional + Mtu int64 `json:"mtu,omitempty"` } // LoadBalancerType defines the Load Balancer that should be created. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml index 2b955cceb..09ecb0c36 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml @@ -168,6 +168,13 @@ spec: (useful for changing apiserver port) format: int32 type: integer + mtu: + description: |- + Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through + this interconnect attachment. Only 1440 and 1500 are allowed. If not + specified, the value will default to 1440. + format: int64 + type: integer name: description: Name is the name of the network to be used. type: string diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml index f0e64db25..66d8ddbca 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml @@ -185,6 +185,13 @@ spec: backend (useful for changing apiserver port) format: int32 type: integer + mtu: + description: |- + Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through + this interconnect attachment. Only 1440 and 1500 are allowed. If not + specified, the value will default to 1440. + format: int64 + type: integer name: description: Name is the name of the network to be used. type: string diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml index 9dcdde341..ddb174495 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml @@ -164,6 +164,13 @@ spec: (useful for changing apiserver port) format: int32 type: integer + mtu: + description: |- + Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through + this interconnect attachment. Only 1440 and 1500 are allowed. If not + specified, the value will default to 1440. + format: int64 + type: integer name: description: Name is the name of the network to be used. type: string From 78a8390e79836e005a6689f56a5d5ef336dbb000 Mon Sep 17 00:00:00 2001 From: Tasdik Rahman Date: Fri, 14 Jun 2024 13:17:15 +0200 Subject: [PATCH 02/28] feat: Allow Setting the desired GCPCluster.Spec.Network.Mtu passed when created a network --- cloud/scope/cluster.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go index 7e4e36b00..5f3b80c62 100644 --- a/cloud/scope/cluster.go +++ b/cloud/scope/cluster.go @@ -131,6 +131,15 @@ func (s *ClusterScope) NetworkName() string { return ptr.Deref(s.GCPCluster.Spec.Network.Name, "default") } +// NetworkMtu returns the Network MTU of 1440 which is the default, otherwise returns back what is being set. +// https://cloud.google.com/vpc/docs/mtu +func (s *ClusterScope) NetworkMtu() int64 { + if s.GCPCluster.Spec.Network.Mtu == 0 { + return int64(1440) + } + return s.GCPCluster.Spec.Network.Mtu +} + // NetworkLink returns the partial URL for the network. func (s *ClusterScope) NetworkLink() string { return fmt.Sprintf("projects/%s/global/networks/%s", s.NetworkProject(), s.NetworkName()) @@ -206,6 +215,7 @@ func (s *ClusterScope) NetworkSpec() *compute.Network { Description: infrav1.ClusterTagKey(s.Name()), AutoCreateSubnetworks: createSubnet, ForceSendFields: []string{"AutoCreateSubnetworks"}, + Mtu: s.NetworkMtu(), } return network From 61324f71d8c1ff4bc9bcf222a300f2f217e38af3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:48:38 +0000 Subject: [PATCH 03/28] Bump the all group with 3 updates Bumps the all group with 3 updates: [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go), [github.com/GoogleCloudPlatform/k8s-cloud-provider](https://github.com/GoogleCloudPlatform/k8s-cloud-provider) and [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Updates `cloud.google.com/go/container` from 1.36.0 to 1.37.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.36.0...pubsub/v1.37.0) Updates `github.com/GoogleCloudPlatform/k8s-cloud-provider` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/releases) - [Commits](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/compare/v1.29.0...v1.30.0) Updates `google.golang.org/api` from 0.183.0 to 0.184.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.183.0...v0.184.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: github.com/GoogleCloudPlatform/k8s-cloud-provider dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 3a751baed..6c5ff74ce 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ replace ( require ( cloud.google.com/go/compute v1.27.0 - cloud.google.com/go/container v1.36.0 + cloud.google.com/go/container v1.37.0 cloud.google.com/go/iam v1.1.8 cloud.google.com/go/resourcemanager v1.9.7 - github.com/GoogleCloudPlatform/k8s-cloud-provider v1.29.0 + github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.12.4 @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.24.0 golang.org/x/mod v0.18.0 golang.org/x/net v0.26.0 - google.golang.org/api v0.183.0 + google.golang.org/api v0.184.0 google.golang.org/grpc v1.64.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -156,9 +156,9 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index c77617745..61cda87e4 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ cloud.google.com/go/compute v1.27.0 h1:EGawh2RUnfHT5g8f/FX3Ds6KZuIBC77hZoDrBvEZw cloud.google.com/go/compute v1.27.0/go.mod h1:LG5HwRmWFKM2C5XxHRiNzkLLXW48WwvyVC0mfWsYPOM= cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/container v1.36.0 h1:M2FsEkZP+hoG88K374jv8KZCxjB6V7RdMr7qzTduAvY= -cloud.google.com/go/container v1.36.0/go.mod h1:mJr10dxcTXqq5BKRpmPzE6fOLyVSJNHsLkOhyIX/eVg= +cloud.google.com/go/container v1.37.0 h1:KZ5IbxnUNcTdBkMfZNum6z4tu61sFHf9Zk7Xl8RzWVI= +cloud.google.com/go/container v1.37.0/go.mod h1:AFsgViXsfLvZHsgHrWQqPqfAPjCwXrZmLjKJ64uhLIw= cloud.google.com/go/iam v1.1.8 h1:r7umDwhj+BQyz0ScZMp4QrGXjSTI3ZINnpgU2nlB/K0= cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE= cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= @@ -22,8 +22,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg6 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.29.0 h1:Qze95fpfGp5u3JVWUiupdHYF1QzxHb1DnhfJNvv8LZw= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.29.0/go.mod h1:uxPncsxa4L5gn4hEsw96f74dH6NaGH2r5qMpfXKENIA= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 h1:yqDyLRXp11LGvQdtSfbdNrp9j1DY/1HWY0eCG7s3WKE= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0/go.mod h1:uxPncsxa4L5gn4hEsw96f74dH6NaGH2r5qMpfXKENIA= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -466,19 +466,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.183.0 h1:PNMeRDwo1pJdgNcFQ9GstuLe/noWKIc89pRWRLMvLwE= -google.golang.org/api v0.183.0/go.mod h1:q43adC5/pHoSZTx5h2mSmdF7NcyfW9JuDyIOJAgS9ZQ= +google.golang.org/api v0.184.0 h1:dmEdk6ZkJNXy1JcDhn/ou0ZUq7n9zropG2/tR4z+RDg= +google.golang.org/api v0.184.0/go.mod h1:CeDTtUEiYENAf8PPG5VZW2yNp2VM3VWbCeTioAZBTBA= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240528184218-531527333157 h1:u7WMYrIrVvs0TF5yaKwKNbcJyySYf+HAIFXxWltJOXE= -google.golang.org/genproto v0.0.0-20240528184218-531527333157/go.mod h1:ubQlAQnzejB8uZzszhrTCU2Fyp6Vi7ZE5nn0c3W8+qQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 h1:HCZ6DlkKtCDAtD8ForECsY3tKuaR+p4R3grlK80uCCc= +google.golang.org/genproto v0.0.0-20240604185151-ef581f913117/go.mod h1:lesfX/+9iA+3OdqeCpoDddJaNxVB1AB6tD7EfqMmprc= +google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= +google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From 0740d351db285901dfa91801986f8008b69f2197 Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Tue, 30 May 2023 22:50:02 +0530 Subject: [PATCH 04/28] Add fields to the GCPManagedControlPlane types - Description - Cluster Network - PrivateCluster - UseIPAliases - Pod - Service - Cluster Security - WorkloadIdentityConfig - AuthenticatorGroupConfig - EnableLagacyAuthorization - IssueClientCertificate - AddonsConfig - LoggingConfig - MonitoringConfig Signed-off-by: Aniruddha Basak Signed-off-by: Akshay Gaikwad --- ...ster.x-k8s.io_gcpmanagedcontrolplanes.yaml | 176 +++++++++++++++ .../v1beta1/gcpmanagedcontrolplane_types.go | 209 ++++++++++++++++++ exp/api/v1beta1/zz_generated.deepcopy.go | 205 +++++++++++++++++ 3 files changed, 590 insertions(+) diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml index 9707e5284..97605ff0a 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml @@ -62,18 +62,153 @@ spec: spec: description: GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane. properties: + addonsConfig: + description: AddonsConfig defines the enabled Cluster Addons. + properties: + GCEPersistentDiskCsiDriver: + description: GCEPersistentDiskCsiDriver whether the Compute Engine + PD CSI driver is enabled for this cluster. + type: boolean + GCPFileStoreCsiDriver: + description: GCPFileStoreCsiDriver whether the GCP Filestore CSI + driver is enabled for this cluster. + type: boolean + GKEBackup: + description: GKEBackup whether the Backup for GKE agent is enabled + for this cluster. + type: boolean + ImageStreaming: + description: ImageStreaming whether to use GCFS (Google Container + File System). + type: boolean + cloudRun: + description: CloudRun enable the Cloud Run addon, which allows the + user to use a managed Knative service. + type: boolean + kalmConfig: + description: KalmConfig enable the KALM addon, which manages the + lifecycle of k8s applications. + type: boolean + type: object clusterName: description: |- ClusterName allows you to specify the name of the GKE cluster. If you don't specify a name then a default name will be created based on the namespace and name of the managed control plane. type: string + clusterNetwork: + description: ClusterNetwork define the cluster network. + properties: + pod: + description: Pod defines the range of CIDRBlock list from where + it gets the IP address. + properties: + cidrBlock: + description: CidrBlock is where all pods in the cluster are + assigned an IP address from this range. Enter a range (in + CIDR notation) within a network range, a mask, or leave + this field blank to use a default range. This setting is + permanent. + type: string + type: object + privateCluster: + description: PrivateCluster defines the private cluster spec. + properties: + controlPlaneCidrBlock: + description: ControlPlaneCidrBlock is the IP range in CIDR + notation to use for the hosted master network. This range + must not overlap with any other ranges in use within the + cluster's network. Honored when enabled is true. + type: string + controlPlaneGlobalAccess: + description: ControlPlaneGlobalAccess is whenever master is + accessible globally or not. Honored when enabled is true. + type: boolean + disableDefaultSNAT: + description: DisableDefaultSNAT is disables cluster default + sNAT rules. Honored when enabled is true. + type: boolean + enablePrivateEndpoint: + description: 'EnablePrivateEndpoint: Whether the master''s + internal IP address is used as the cluster endpoint.' + type: boolean + enablePrivateNodes: + description: 'EnablePrivateNodes: Whether nodes have internal + IP addresses only. If enabled, all nodes are given only + RFC 1918 private addresses and communicate with the master + via private networking.' + type: boolean + type: object + service: + description: Service defines the range of CIDRBlock list from + where it gets the IP address. + properties: + cidrBlock: + description: CidrBlock is where cluster services will be assigned + an IP address from this IP address range. Enter a range + (in CIDR notation) within a network range, a mask, or leave + this field blank to use a default range. This setting is + permanent. + type: string + type: object + useIPAliases: + description: UseIPAliases is whether alias IPs will be used for + pod IPs in the cluster. If false, routes will be used for pod + IPs in the cluster. + type: boolean + type: object + clusterSecurity: + description: ClusterSecurity defines the cluster security. + properties: + authenticatorGroupConfig: + description: AuthenticatorGroupConfig is RBAC security group for + use with Google security groups in Kubernetes RBAC. + properties: + securityGroups: + description: SecurityGroups is the name of the security group-of-groups + to be used. + type: string + type: object + enableLegacyAuthorization: + description: EnableLegacyAuthorization Whether the legacy (ABAC) + authorizer is enabled for this cluster. + type: boolean + issueClientCertificate: + description: IssueClientCertificate is weather to issue a client + certificate. + type: boolean + workloadIdentityConfig: + description: WorkloadIdentityConfig allows workloads in your GKE + clusters to impersonate Identity and Access Management (IAM) + service accounts to access Google Cloud services + properties: + workloadPool: + description: WorkloadPool is the workload pool to attach all + Kubernetes service accounts to Google Cloud services. Only + relevant when enabled is true + type: string + type: object + type: object controlPlaneVersion: description: |- ControlPlaneVersion represents the control plane version of the GKE cluster. If not specified, the default version currently supported by GKE will be used. type: string + defaultMaxPodsPerNode: + description: DefaultMaXPodsPerNode is the maximum number of pods can + be run simultaneously on a Node, and only honored if Cluster is + created with IP Alias support. + type: integer + defaultNodeLocation: + description: DefaultNodeLocation is the list of Google Compute Engine + zones in which the cluster's Node should be located. + items: + type: string + type: array + description: + description: Description describe the cluster. + type: string enableAutopilot: description: EnableAutopilot indicates whether to enable autopilot for this GKE cluster. @@ -98,6 +233,26 @@ spec: Location represents the location (region or zone) in which the GKE cluster will be created. type: string + loggingConfig: + description: LoggingConfig defines the logging on Cluster. + properties: + apiServer: + description: APIServer enables the api server logging. + type: boolean + controllerManager: + description: ControllerManager enables the controller manager + logging. + type: boolean + scheduler: + description: Scheduler enables the scheduler logging. + type: boolean + systemComponents: + description: SystemComponents enables the system component logging. + type: boolean + workloads: + description: Workloads enables the Workloads logging. + type: boolean + type: object master_authorized_networks_config: description: |- MasterAuthorizedNetworksConfig represents configuration options for master authorized networks feature of the GKE cluster. @@ -126,6 +281,27 @@ spec: Public IP addresses. type: boolean type: object + monitoringConfig: + description: MonitoringConfig defines the monitoring on Cluster. + properties: + apiServer: + description: APIServer enables the api server monitoring. + type: boolean + controllerManager: + description: ControllerManager enables the controller manager + monitoring. + type: boolean + enableManagedPrometheus: + description: EnableManagedPrometheus Enable Google Cloud Managed + Service for Prometheus in the cluster. + type: boolean + scheduler: + description: Scheduler enables the scheduler monitoring. + type: boolean + systemComponents: + description: SystemComponents enables the system component monitoring. + type: boolean + type: object project: description: Project is the name of the project to deploy the cluster to. diff --git a/exp/api/v1beta1/gcpmanagedcontrolplane_types.go b/exp/api/v1beta1/gcpmanagedcontrolplane_types.go index b0fb6540d..2871d44fc 100644 --- a/exp/api/v1beta1/gcpmanagedcontrolplane_types.go +++ b/exp/api/v1beta1/gcpmanagedcontrolplane_types.go @@ -27,6 +27,181 @@ const ( ManagedControlPlaneFinalizer = "gcpmanagedcontrolplane.infrastructure.cluster.x-k8s.io" ) +// PrivateCluster defines a private Cluster. +type PrivateCluster struct { + // EnablePrivateEndpoint: Whether the master's internal IP + // address is used as the cluster endpoint. + // +optional + EnablePrivateEndpoint bool `json:"enablePrivateEndpoint,omitempty"` + + // EnablePrivateNodes: Whether nodes have internal IP + // addresses only. If enabled, all nodes are given only RFC + // 1918 private addresses and communicate with the master via + // private networking. + // +optional + EnablePrivateNodes bool `json:"enablePrivateNodes,omitempty"` + + // ControlPlaneCidrBlock is the IP range in CIDR notation to use for the hosted master network. This range must not + // overlap with any other ranges in use within the cluster's network. Honored when enabled is true. + // +optional + ControlPlaneCidrBlock string `json:"controlPlaneCidrBlock,omitempty"` + + // ControlPlaneGlobalAccess is whenever master is accessible globally or not. Honored when enabled is true. + // +optional + ControlPlaneGlobalAccess bool `json:"controlPlaneGlobalAccess,omitempty"` + + // DisableDefaultSNAT is disables cluster default sNAT rules. Honored when enabled is true. + // +optional + DisableDefaultSNAT bool `json:"disableDefaultSNAT,omitempty"` +} + +// ClusterNetworkPod the range of CIDRBlock list from where it gets the IP address. +type ClusterNetworkPod struct { + // CidrBlock is where all pods in the cluster are assigned an IP address from this range. Enter a range + // (in CIDR notation) within a network range, a mask, or leave this field blank to use a default range. + // This setting is permanent. + // +optional + CidrBlock string `json:"cidrBlock,omitempty"` +} + +// ClusterNetworkService defines the range of CIDRBlock list from where it gets the IP address. +type ClusterNetworkService struct { + // CidrBlock is where cluster services will be assigned an IP address from this IP address range. Enter a range + // (in CIDR notation) within a network range, a mask, or leave this field blank to use a default range. + // This setting is permanent. + // +optional + CidrBlock string `json:"cidrBlock,omitempty"` +} + +// ClusterNetwork define the cluster network. +type ClusterNetwork struct { + // PrivateCluster defines the private cluster spec. + // +optional + PrivateCluster *PrivateCluster `json:"privateCluster,omitempty"` + + // UseIPAliases is whether alias IPs will be used for pod IPs in the cluster. If false, routes will be used for + // pod IPs in the cluster. + // +optional + UseIPAliases bool `json:"useIPAliases,omitempty"` + + // Pod defines the range of CIDRBlock list from where it gets the IP address. + // +optional + Pod *ClusterNetworkPod `json:"pod,omitempty"` + + // Service defines the range of CIDRBlock list from where it gets the IP address. + // +optional + Service *ClusterNetworkService `json:"service,omitempty"` +} + +// WorkloadIdentityConfig allows workloads in your GKE clusters to impersonate Identity and Access Management (IAM) +// service accounts to access Google Cloud services. +type WorkloadIdentityConfig struct { + // WorkloadPool is the workload pool to attach all Kubernetes service accounts to Google Cloud services. + // Only relevant when enabled is true + // +kubebuilder:validation:Required + WorkloadPool string `json:"workloadPool,omitempty"` +} + +// AuthenticatorGroupConfig is RBAC security group for use with Google security groups in Kubernetes RBAC. +type AuthenticatorGroupConfig struct { + // SecurityGroups is the name of the security group-of-groups to be used. + // +kubebuilder:validation:Required + SecurityGroups string `json:"securityGroups,omitempty"` +} + +// ClusterSecurity defines the cluster security. +type ClusterSecurity struct { + // WorkloadIdentityConfig allows workloads in your GKE clusters to impersonate Identity and Access Management (IAM) + // service accounts to access Google Cloud services + // +optional + WorkloadIdentityConfig *WorkloadIdentityConfig `json:"workloadIdentityConfig,omitempty"` + + // AuthenticatorGroupConfig is RBAC security group for use with Google security groups in Kubernetes RBAC. + // +optional + AuthenticatorGroupConfig *AuthenticatorGroupConfig `json:"authenticatorGroupConfig,omitempty"` + + // EnableLegacyAuthorization Whether the legacy (ABAC) authorizer is enabled for this cluster. + // +optional + EnableLegacyAuthorization bool `json:"enableLegacyAuthorization,omitempty"` + + // IssueClientCertificate is weather to issue a client certificate. + // +optional + IssueClientCertificate bool `json:"issueClientCertificate,omitempty"` +} + +// AddonsConfig defines the enabled Cluster Addons. +type AddonsConfig struct { + // CloudRun enable the Cloud Run addon, which allows the user to use a managed Knative service. + // +optional + CloudRun bool `json:"cloudRun,omitempty"` + + // KalmConfig enable the KALM addon, which manages the lifecycle of k8s applications. + // +optional + KalmConfig bool `json:"kalmConfig,omitempty"` + + // GKEBackup whether the Backup for GKE agent is enabled for this cluster. + // +optional + GKEBackup bool `json:"GKEBackup,omitempty"` + + // GCEPersistentDiskCsiDriver whether the Compute Engine PD CSI driver is enabled for this cluster. + // +optional + GCEPersistentDiskCsiDriver bool `json:"GCEPersistentDiskCsiDriver,omitempty"` + + // GCPFileStoreCsiDriver whether the GCP Filestore CSI driver is enabled for this cluster. + // +optional + GCPFileStoreCsiDriver bool `json:"GCPFileStoreCsiDriver,omitempty"` + + // ImageStreaming whether to use GCFS (Google Container File System). + // +optional + ImageStreaming bool `json:"ImageStreaming,omitempty"` +} + +// LoggingConfig defines the logging on Cluster. +type LoggingConfig struct { + // SystemComponents enables the system component logging. + // +optional + SystemComponents bool `json:"systemComponents,omitempty"` + + // Workloads enables the Workloads logging. + // +optional + Workloads bool `json:"workloads,omitempty"` + + // APIServer enables the api server logging. + // +optional + APIServer bool `json:"apiServer,omitempty"` + + // Scheduler enables the scheduler logging. + // +optional + Scheduler bool `json:"scheduler,omitempty"` + + // ControllerManager enables the controller manager logging. + // +optional + ControllerManager bool `json:"controllerManager,omitempty"` +} + +// MonitoringConfig defines the monitoring on Cluster. +type MonitoringConfig struct { + // SystemComponents enables the system component monitoring. + // +optional + SystemComponents bool `json:"systemComponents,omitempty"` + + // APIServer enables the api server monitoring. + // +optional + APIServer bool `json:"apiServer,omitempty"` + + // Scheduler enables the scheduler monitoring. + // +optional + Scheduler bool `json:"scheduler,omitempty"` + + // ControllerManager enables the controller manager monitoring. + // +optional + ControllerManager bool `json:"controllerManager,omitempty"` + + // EnableManagedPrometheus Enable Google Cloud Managed Service for Prometheus in the cluster. + // +optional + EnableManagedPrometheus bool `json:"enableManagedPrometheus,omitempty"` +} + // GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane. type GCPManagedControlPlaneSpec struct { // ClusterName allows you to specify the name of the GKE cluster. @@ -34,6 +209,40 @@ type GCPManagedControlPlaneSpec struct { // based on the namespace and name of the managed control plane. // +optional ClusterName string `json:"clusterName,omitempty"` + + // Description describe the cluster. + // +optional + Description string `json:"description,omitempty"` + + // ClusterNetwork define the cluster network. + // +optional + ClusterNetwork *ClusterNetwork `json:"clusterNetwork,omitempty"` + + // ClusterSecurity defines the cluster security. + // +optional + ClusterSecurity *ClusterSecurity `json:"clusterSecurity,omitempty"` + + // AddonsConfig defines the enabled Cluster Addons. + // +optional + AddonsConfig *AddonsConfig `json:"addonsConfig,omitempty"` + + // LoggingConfig defines the logging on Cluster. + // +optional + LoggingConfig *LoggingConfig `json:"loggingConfig,omitempty"` + + // MonitoringConfig defines the monitoring on Cluster. + // +optional + MonitoringConfig *MonitoringConfig `json:"monitoringConfig,omitempty"` + + // DefaultNodeLocation is the list of Google Compute Engine zones in which the cluster's Node should be located. + // +optional + DefaultNodeLocation []string `json:"defaultNodeLocation,omitempty"` + + // DefaultMaXPodsPerNode is the maximum number of pods can be run simultaneously on a Node, and only honored if + // Cluster is created with IP Alias support. + // +optional + DefaultMaxPodsPerNode int `json:"defaultMaxPodsPerNode,omitempty"` + // Project is the name of the project to deploy the cluster to. Project string `json:"project"` // Location represents the location (region or zone) in which the GKE cluster diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go index 15e7d6543..31f6befc5 100644 --- a/exp/api/v1beta1/zz_generated.deepcopy.go +++ b/exp/api/v1beta1/zz_generated.deepcopy.go @@ -26,6 +26,121 @@ import ( cluster_apiapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AddonsConfig) DeepCopyInto(out *AddonsConfig) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AddonsConfig. +func (in *AddonsConfig) DeepCopy() *AddonsConfig { + if in == nil { + return nil + } + out := new(AddonsConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AuthenticatorGroupConfig) DeepCopyInto(out *AuthenticatorGroupConfig) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthenticatorGroupConfig. +func (in *AuthenticatorGroupConfig) DeepCopy() *AuthenticatorGroupConfig { + if in == nil { + return nil + } + out := new(AuthenticatorGroupConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterNetwork) DeepCopyInto(out *ClusterNetwork) { + *out = *in + if in.PrivateCluster != nil { + in, out := &in.PrivateCluster, &out.PrivateCluster + *out = new(PrivateCluster) + **out = **in + } + if in.Pod != nil { + in, out := &in.Pod, &out.Pod + *out = new(ClusterNetworkPod) + **out = **in + } + if in.Service != nil { + in, out := &in.Service, &out.Service + *out = new(ClusterNetworkService) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNetwork. +func (in *ClusterNetwork) DeepCopy() *ClusterNetwork { + if in == nil { + return nil + } + out := new(ClusterNetwork) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterNetworkPod) DeepCopyInto(out *ClusterNetworkPod) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNetworkPod. +func (in *ClusterNetworkPod) DeepCopy() *ClusterNetworkPod { + if in == nil { + return nil + } + out := new(ClusterNetworkPod) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterNetworkService) DeepCopyInto(out *ClusterNetworkService) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNetworkService. +func (in *ClusterNetworkService) DeepCopy() *ClusterNetworkService { + if in == nil { + return nil + } + out := new(ClusterNetworkService) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterSecurity) DeepCopyInto(out *ClusterSecurity) { + *out = *in + if in.WorkloadIdentityConfig != nil { + in, out := &in.WorkloadIdentityConfig, &out.WorkloadIdentityConfig + *out = new(WorkloadIdentityConfig) + **out = **in + } + if in.AuthenticatorGroupConfig != nil { + in, out := &in.AuthenticatorGroupConfig, &out.AuthenticatorGroupConfig + *out = new(AuthenticatorGroupConfig) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSecurity. +func (in *ClusterSecurity) DeepCopy() *ClusterSecurity { + if in == nil { + return nil + } + out := new(ClusterSecurity) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GCPManagedCluster) DeepCopyInto(out *GCPManagedCluster) { *out = *in @@ -212,6 +327,36 @@ func (in *GCPManagedControlPlaneList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GCPManagedControlPlaneSpec) DeepCopyInto(out *GCPManagedControlPlaneSpec) { *out = *in + if in.ClusterNetwork != nil { + in, out := &in.ClusterNetwork, &out.ClusterNetwork + *out = new(ClusterNetwork) + (*in).DeepCopyInto(*out) + } + if in.ClusterSecurity != nil { + in, out := &in.ClusterSecurity, &out.ClusterSecurity + *out = new(ClusterSecurity) + (*in).DeepCopyInto(*out) + } + if in.AddonsConfig != nil { + in, out := &in.AddonsConfig, &out.AddonsConfig + *out = new(AddonsConfig) + **out = **in + } + if in.LoggingConfig != nil { + in, out := &in.LoggingConfig, &out.LoggingConfig + *out = new(LoggingConfig) + **out = **in + } + if in.MonitoringConfig != nil { + in, out := &in.MonitoringConfig, &out.MonitoringConfig + *out = new(MonitoringConfig) + **out = **in + } + if in.DefaultNodeLocation != nil { + in, out := &in.DefaultNodeLocation, &out.DefaultNodeLocation + *out = make([]string, len(*in)) + copy(*out, *in) + } if in.ReleaseChannel != nil { in, out := &in.ReleaseChannel, &out.ReleaseChannel *out = new(ReleaseChannel) @@ -469,6 +614,21 @@ func (in *LinuxNodeConfig) DeepCopy() *LinuxNodeConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LoggingConfig) DeepCopyInto(out *LoggingConfig) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LoggingConfig. +func (in *LoggingConfig) DeepCopy() *LoggingConfig { + if in == nil { + return nil + } + out := new(LoggingConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MasterAuthorizedNetworksConfig) DeepCopyInto(out *MasterAuthorizedNetworksConfig) { *out = *in @@ -515,6 +675,21 @@ func (in *MasterAuthorizedNetworksConfigCidrBlock) DeepCopy() *MasterAuthorizedN return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MonitoringConfig) DeepCopyInto(out *MonitoringConfig) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MonitoringConfig. +func (in *MonitoringConfig) DeepCopy() *MonitoringConfig { + if in == nil { + return nil + } + out := new(MonitoringConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeNetworkConfig) DeepCopyInto(out *NodeNetworkConfig) { *out = *in @@ -631,6 +806,21 @@ func (in *NodeSecurityConfig) DeepCopy() *NodeSecurityConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PrivateCluster) DeepCopyInto(out *PrivateCluster) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PrivateCluster. +func (in *PrivateCluster) DeepCopy() *PrivateCluster { + if in == nil { + return nil + } + out := new(PrivateCluster) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServiceAccountConfig) DeepCopyInto(out *ServiceAccountConfig) { *out = *in @@ -704,3 +894,18 @@ func (in Taints) DeepCopy() Taints { in.DeepCopyInto(out) return *out } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *WorkloadIdentityConfig) DeepCopyInto(out *WorkloadIdentityConfig) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkloadIdentityConfig. +func (in *WorkloadIdentityConfig) DeepCopy() *WorkloadIdentityConfig { + if in == nil { + return nil + } + out := new(WorkloadIdentityConfig) + in.DeepCopyInto(out) + return out +} From 41d4bd4c3c85bef2a3c1640c5f27cf05af0f7745 Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Wed, 27 Mar 2024 16:59:29 +0530 Subject: [PATCH 05/28] Reconcile GCPManagedControlPlane new settings Signed-off-by: Akshay Gaikwad --- .../services/container/clusters/reconcile.go | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go index 5a3f8cb08..4ef595080 100644 --- a/cloud/services/container/clusters/reconcile.go +++ b/cloud/services/container/clusters/reconcile.go @@ -251,9 +251,10 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error { isRegional := shared.IsRegional(s.scope.Region()) cluster := &containerpb.Cluster{ - Name: s.scope.ClusterName(), - Network: *s.scope.GCPManagedCluster.Spec.Network.Name, - Subnetwork: s.getSubnetNameInClusterRegion(), + Name: s.scope.ClusterName(), + Description: s.scope.GCPManagedControlPlane.Spec.Description, + Network: *s.scope.GCPManagedCluster.Spec.Network.Name, + Subnetwork: s.getSubnetNameInClusterRegion(), Autopilot: &containerpb.Autopilot{ Enabled: s.scope.GCPManagedControlPlane.Spec.EnableAutopilot, }, @@ -265,6 +266,25 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error { if s.scope.GCPManagedControlPlane.Spec.ControlPlaneVersion != nil { cluster.InitialClusterVersion = convertToSdkMasterVersion(*s.scope.GCPManagedControlPlane.Spec.ControlPlaneVersion) } + if s.scope.GCPManagedControlPlane.Spec.ClusterNetwork != nil { + cn := s.scope.GCPManagedControlPlane.Spec.ClusterNetwork + if cn.UseIPAliases { + cluster.IpAllocationPolicy = &containerpb.IPAllocationPolicy{} + cluster.IpAllocationPolicy.UseIpAliases = cn.UseIPAliases + } + if cn.PrivateCluster != nil { + cluster.PrivateClusterConfig = &containerpb.PrivateClusterConfig{} + cluster.PrivateClusterConfig.EnablePrivateEndpoint = cn.PrivateCluster.EnablePrivateEndpoint + cluster.PrivateClusterConfig.EnablePrivateNodes = cn.PrivateCluster.EnablePrivateNodes + + cluster.PrivateClusterConfig.MasterIpv4CidrBlock = cn.PrivateCluster.ControlPlaneCidrBlock + cluster.PrivateClusterConfig.MasterGlobalAccessConfig = &containerpb.PrivateClusterMasterGlobalAccessConfig{ + Enabled: cn.PrivateCluster.ControlPlaneGlobalAccess, + } + + // TODO(Akshay): Set Default SNAT + } + } if !s.scope.IsAutopilotCluster() { cluster.NodePools = scope.ConvertToSdkNodePools(nodePools, machinePools, isRegional, cluster.GetName()) } From 4dd31fc739b751a4a604122821f7b921610173c7 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Fri, 21 Jun 2024 12:52:45 +0200 Subject: [PATCH 06/28] bump CAPI to v1.7.3 --- Makefile | 2 +- Tiltfile | 2 +- go.mod | 10 +++++----- go.sum | 28 ++++++++-------------------- hack/tools/go.mod | 2 +- hack/tools/go.sum | 4 ++-- test/e2e/config/gcp-ci.yaml | 12 ++++++------ 7 files changed, 24 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index d9b1b9a5f..3e5964453 100644 --- a/Makefile +++ b/Makefile @@ -489,7 +489,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KIND) $(KUBECTL) ./hack/install-cert-manager.sh $(CERT_MANAGER_VER) # Deploy CAPI - curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f - + curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f - # Deploy CAPG $(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi diff --git a/Tiltfile b/Tiltfile index 0dbb12a31..233cfc4eb 100644 --- a/Tiltfile +++ b/Tiltfile @@ -18,7 +18,7 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capg", - "capi_version": "v1.7.2", + "capi_version": "v1.7.3", "cert_manager_version": "v1.14.4", "kubernetes_version": "v1.29.3", } diff --git a/go.mod b/go.mod index 6c5ff74ce..6c2ffef7a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace ( github.com/google/cel-go => github.com/google/cel-go v0.17.7 // kube-openapi should match the version imported by CAPI. k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.2 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3 ) require ( @@ -35,9 +35,9 @@ require ( k8s.io/component-base v0.29.5 k8s.io/klog/v2 v2.120.1 k8s.io/utils v0.0.0-20240102154912-e7106e64919e - sigs.k8s.io/cluster-api v1.7.2 - sigs.k8s.io/cluster-api/test v1.7.2 - sigs.k8s.io/controller-runtime v0.17.3 + sigs.k8s.io/cluster-api v1.7.3 + sigs.k8s.io/cluster-api/test v1.7.3 + sigs.k8s.io/controller-runtime v0.17.5 ) require ( @@ -169,7 +169,7 @@ require ( k8s.io/cluster-bootstrap v0.29.5 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kind v0.22.0 // indirect + sigs.k8s.io/kind v0.23.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 61cda87e4..d3a17e510 100644 --- a/go.sum +++ b/go.sum @@ -72,7 +72,6 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -99,7 +98,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI= github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -201,10 +199,8 @@ github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -224,7 +220,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= @@ -248,7 +243,6 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= @@ -257,12 +251,10 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -299,7 +291,6 @@ github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNo github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -427,7 +418,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -498,7 +488,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= @@ -542,18 +531,17 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= -sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE= -sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= -sigs.k8s.io/cluster-api/test v1.7.2 h1:muacGu5G/DGz2uTv3CUxml2QLi8fxbIra4CxA2S31KE= -sigs.k8s.io/cluster-api/test v1.7.2/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM= -sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk= -sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= +sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs= +sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= +sigs.k8s.io/cluster-api/test v1.7.3 h1:Nl1IOF03MZzjr6x45IJOFWlV4cNHpJ45qsn3A+1Tf98= +sigs.k8s.io/cluster-api/test v1.7.3/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4= +sigs.k8s.io/controller-runtime v0.17.5 h1:1FI9Lm7NiOOmBsgTV36/s2XrEFXnO2C4sbg/Zme72Rw= +sigs.k8s.io/controller-runtime v0.17.5/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kind v0.22.0 h1:z/+yr/azoOfzsfooqRsPw1wjJlqT/ukXP0ShkHwNlsI= -sigs.k8s.io/kind v0.22.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs= +sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg= +sigs.k8s.io/kind v0.23.0/go.mod h1:ZQ1iZuJLh3T+O8fzhdi3VWcFTzsdXtNv2ppsHc8JQ7s= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index d448c867b..fd145ce8d 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-gcp/hack/tools go 1.21.10 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.2 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3 require sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240325211526-a53d4aa71661 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index dd705bea6..9171bf83d 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -109,8 +109,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE= -sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= +sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs= +sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240325211526-a53d4aa71661 h1:nSbbsL19ZwVzWq7+4PuH475FmA2Tu0YXVbH32lpk4Ts= sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240325211526-a53d4aa71661/go.mod h1:5/Owkfx2pUBG+vdwmJtWpkFjKJJyr5MnjRg79SruzWc= sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A= diff --git a/test/e2e/config/gcp-ci.yaml b/test/e2e/config/gcp-ci.yaml index 39abbe42c..d02104c4a 100644 --- a/test/e2e/config/gcp-ci.yaml +++ b/test/e2e/config/gcp-ci.yaml @@ -15,8 +15,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.7.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/core-components.yaml + - name: v1.7.3 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -28,8 +28,8 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.7.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/bootstrap-components.yaml + - name: v1.7.3 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -41,8 +41,8 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.7.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/control-plane-components.yaml + - name: v1.7.3 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" From 60f60c54308711cb873506e70568b0aa42436e1c Mon Sep 17 00:00:00 2001 From: Mohamed Belgaied Hassine Date: Fri, 21 Jun 2024 15:11:40 +0200 Subject: [PATCH 07/28] Removed parts of the newly added API objects, did a make generate and its pre-requisite of go version in go.mod Signed-off-by: Mohamed Belgaied Hassine --- ...ster.x-k8s.io_gcpmanagedcontrolplanes.yaml | 161 +++--------------- .../manager_prometheus_metrics_patch.yaml | 4 +- config/manager/manager.yaml | 2 +- .../v1beta1/gcpmanagedcontrolplane_types.go | 120 +------------ exp/api/v1beta1/zz_generated.deepcopy.go | 95 ----------- hack/tools/go.mod | 2 +- 6 files changed, 29 insertions(+), 355 deletions(-) diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml index 97605ff0a..39a580c90 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml @@ -62,34 +62,6 @@ spec: spec: description: GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane. properties: - addonsConfig: - description: AddonsConfig defines the enabled Cluster Addons. - properties: - GCEPersistentDiskCsiDriver: - description: GCEPersistentDiskCsiDriver whether the Compute Engine - PD CSI driver is enabled for this cluster. - type: boolean - GCPFileStoreCsiDriver: - description: GCPFileStoreCsiDriver whether the GCP Filestore CSI - driver is enabled for this cluster. - type: boolean - GKEBackup: - description: GKEBackup whether the Backup for GKE agent is enabled - for this cluster. - type: boolean - ImageStreaming: - description: ImageStreaming whether to use GCFS (Google Container - File System). - type: boolean - cloudRun: - description: CloudRun enable the Cloud Run addon, which allows the - user to use a managed Knative service. - type: boolean - kalmConfig: - description: KalmConfig enable the KALM addon, which manages the - lifecycle of k8s applications. - type: boolean - type: object clusterName: description: |- ClusterName allows you to specify the name of the GKE cluster. @@ -104,39 +76,39 @@ spec: it gets the IP address. properties: cidrBlock: - description: CidrBlock is where all pods in the cluster are - assigned an IP address from this range. Enter a range (in - CIDR notation) within a network range, a mask, or leave - this field blank to use a default range. This setting is - permanent. + description: |- + CidrBlock is where all pods in the cluster are assigned an IP address from this range. Enter a range + (in CIDR notation) within a network range, a mask, or leave this field blank to use a default range. + This setting is permanent. type: string type: object privateCluster: description: PrivateCluster defines the private cluster spec. properties: controlPlaneCidrBlock: - description: ControlPlaneCidrBlock is the IP range in CIDR - notation to use for the hosted master network. This range - must not overlap with any other ranges in use within the - cluster's network. Honored when enabled is true. + description: |- + ControlPlaneCidrBlock is the IP range in CIDR notation to use for the hosted master network. This range must not + overlap with any other ranges in use within the cluster's network. Honored when enabled is true. type: string controlPlaneGlobalAccess: description: ControlPlaneGlobalAccess is whenever master is accessible globally or not. Honored when enabled is true. type: boolean disableDefaultSNAT: - description: DisableDefaultSNAT is disables cluster default - sNAT rules. Honored when enabled is true. + description: DisableDefaultSNAT disables cluster default sNAT + rules. Honored when enabled is true. type: boolean enablePrivateEndpoint: - description: 'EnablePrivateEndpoint: Whether the master''s - internal IP address is used as the cluster endpoint.' + description: |- + EnablePrivateEndpoint: Whether the master's internal IP + address is used as the cluster endpoint. type: boolean enablePrivateNodes: - description: 'EnablePrivateNodes: Whether nodes have internal - IP addresses only. If enabled, all nodes are given only - RFC 1918 private addresses and communicate with the master - via private networking.' + description: |- + EnablePrivateNodes: Whether nodes have internal IP + addresses only. If enabled, all nodes are given only RFC + 1918 private addresses and communicate with the master via + private networking. type: boolean type: object service: @@ -144,68 +116,24 @@ spec: where it gets the IP address. properties: cidrBlock: - description: CidrBlock is where cluster services will be assigned - an IP address from this IP address range. Enter a range - (in CIDR notation) within a network range, a mask, or leave - this field blank to use a default range. This setting is - permanent. + description: |- + CidrBlock is where cluster services will be assigned an IP address from this IP address range. Enter a range + (in CIDR notation) within a network range, a mask, or leave this field blank to use a default range. + This setting is permanent. type: string type: object useIPAliases: - description: UseIPAliases is whether alias IPs will be used for - pod IPs in the cluster. If false, routes will be used for pod - IPs in the cluster. + description: |- + UseIPAliases is whether alias IPs will be used for pod IPs in the cluster. If false, routes will be used for + pod IPs in the cluster. type: boolean type: object - clusterSecurity: - description: ClusterSecurity defines the cluster security. - properties: - authenticatorGroupConfig: - description: AuthenticatorGroupConfig is RBAC security group for - use with Google security groups in Kubernetes RBAC. - properties: - securityGroups: - description: SecurityGroups is the name of the security group-of-groups - to be used. - type: string - type: object - enableLegacyAuthorization: - description: EnableLegacyAuthorization Whether the legacy (ABAC) - authorizer is enabled for this cluster. - type: boolean - issueClientCertificate: - description: IssueClientCertificate is weather to issue a client - certificate. - type: boolean - workloadIdentityConfig: - description: WorkloadIdentityConfig allows workloads in your GKE - clusters to impersonate Identity and Access Management (IAM) - service accounts to access Google Cloud services - properties: - workloadPool: - description: WorkloadPool is the workload pool to attach all - Kubernetes service accounts to Google Cloud services. Only - relevant when enabled is true - type: string - type: object - type: object controlPlaneVersion: description: |- ControlPlaneVersion represents the control plane version of the GKE cluster. If not specified, the default version currently supported by GKE will be used. type: string - defaultMaxPodsPerNode: - description: DefaultMaXPodsPerNode is the maximum number of pods can - be run simultaneously on a Node, and only honored if Cluster is - created with IP Alias support. - type: integer - defaultNodeLocation: - description: DefaultNodeLocation is the list of Google Compute Engine - zones in which the cluster's Node should be located. - items: - type: string - type: array description: description: Description describe the cluster. type: string @@ -233,26 +161,6 @@ spec: Location represents the location (region or zone) in which the GKE cluster will be created. type: string - loggingConfig: - description: LoggingConfig defines the logging on Cluster. - properties: - apiServer: - description: APIServer enables the api server logging. - type: boolean - controllerManager: - description: ControllerManager enables the controller manager - logging. - type: boolean - scheduler: - description: Scheduler enables the scheduler logging. - type: boolean - systemComponents: - description: SystemComponents enables the system component logging. - type: boolean - workloads: - description: Workloads enables the Workloads logging. - type: boolean - type: object master_authorized_networks_config: description: |- MasterAuthorizedNetworksConfig represents configuration options for master authorized networks feature of the GKE cluster. @@ -281,27 +189,6 @@ spec: Public IP addresses. type: boolean type: object - monitoringConfig: - description: MonitoringConfig defines the monitoring on Cluster. - properties: - apiServer: - description: APIServer enables the api server monitoring. - type: boolean - controllerManager: - description: ControllerManager enables the controller manager - monitoring. - type: boolean - enableManagedPrometheus: - description: EnableManagedPrometheus Enable Google Cloud Managed - Service for Prometheus in the cluster. - type: boolean - scheduler: - description: Scheduler enables the scheduler monitoring. - type: boolean - systemComponents: - description: SystemComponents enables the system component monitoring. - type: boolean - type: object project: description: Project is the name of the project to deploy the cluster to. diff --git a/config/default/manager_prometheus_metrics_patch.yaml b/config/default/manager_prometheus_metrics_patch.yaml index 0b96c6813..5e0c3c4d5 100644 --- a/config/default/manager_prometheus_metrics_patch.yaml +++ b/config/default/manager_prometheus_metrics_patch.yaml @@ -11,9 +11,9 @@ spec: prometheus.io/scrape: 'true' spec: containers: - # Expose the prometheus metrics on default port + Expose the prometheus metrics on default port - name: manager ports: - containerPort: 8080 - name: metrics + name: metrics2 protocol: TCP diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 7391b4bf7..6d92245d2 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -33,7 +33,7 @@ spec: name: healthz protocol: TCP - containerPort: 8443 - name: metrics + name: metrics-2 protocol: TCP readinessProbe: httpGet: diff --git a/exp/api/v1beta1/gcpmanagedcontrolplane_types.go b/exp/api/v1beta1/gcpmanagedcontrolplane_types.go index 2871d44fc..b7b1699cf 100644 --- a/exp/api/v1beta1/gcpmanagedcontrolplane_types.go +++ b/exp/api/v1beta1/gcpmanagedcontrolplane_types.go @@ -50,7 +50,7 @@ type PrivateCluster struct { // +optional ControlPlaneGlobalAccess bool `json:"controlPlaneGlobalAccess,omitempty"` - // DisableDefaultSNAT is disables cluster default sNAT rules. Honored when enabled is true. + // DisableDefaultSNAT disables cluster default sNAT rules. Honored when enabled is true. // +optional DisableDefaultSNAT bool `json:"disableDefaultSNAT,omitempty"` } @@ -109,99 +109,6 @@ type AuthenticatorGroupConfig struct { SecurityGroups string `json:"securityGroups,omitempty"` } -// ClusterSecurity defines the cluster security. -type ClusterSecurity struct { - // WorkloadIdentityConfig allows workloads in your GKE clusters to impersonate Identity and Access Management (IAM) - // service accounts to access Google Cloud services - // +optional - WorkloadIdentityConfig *WorkloadIdentityConfig `json:"workloadIdentityConfig,omitempty"` - - // AuthenticatorGroupConfig is RBAC security group for use with Google security groups in Kubernetes RBAC. - // +optional - AuthenticatorGroupConfig *AuthenticatorGroupConfig `json:"authenticatorGroupConfig,omitempty"` - - // EnableLegacyAuthorization Whether the legacy (ABAC) authorizer is enabled for this cluster. - // +optional - EnableLegacyAuthorization bool `json:"enableLegacyAuthorization,omitempty"` - - // IssueClientCertificate is weather to issue a client certificate. - // +optional - IssueClientCertificate bool `json:"issueClientCertificate,omitempty"` -} - -// AddonsConfig defines the enabled Cluster Addons. -type AddonsConfig struct { - // CloudRun enable the Cloud Run addon, which allows the user to use a managed Knative service. - // +optional - CloudRun bool `json:"cloudRun,omitempty"` - - // KalmConfig enable the KALM addon, which manages the lifecycle of k8s applications. - // +optional - KalmConfig bool `json:"kalmConfig,omitempty"` - - // GKEBackup whether the Backup for GKE agent is enabled for this cluster. - // +optional - GKEBackup bool `json:"GKEBackup,omitempty"` - - // GCEPersistentDiskCsiDriver whether the Compute Engine PD CSI driver is enabled for this cluster. - // +optional - GCEPersistentDiskCsiDriver bool `json:"GCEPersistentDiskCsiDriver,omitempty"` - - // GCPFileStoreCsiDriver whether the GCP Filestore CSI driver is enabled for this cluster. - // +optional - GCPFileStoreCsiDriver bool `json:"GCPFileStoreCsiDriver,omitempty"` - - // ImageStreaming whether to use GCFS (Google Container File System). - // +optional - ImageStreaming bool `json:"ImageStreaming,omitempty"` -} - -// LoggingConfig defines the logging on Cluster. -type LoggingConfig struct { - // SystemComponents enables the system component logging. - // +optional - SystemComponents bool `json:"systemComponents,omitempty"` - - // Workloads enables the Workloads logging. - // +optional - Workloads bool `json:"workloads,omitempty"` - - // APIServer enables the api server logging. - // +optional - APIServer bool `json:"apiServer,omitempty"` - - // Scheduler enables the scheduler logging. - // +optional - Scheduler bool `json:"scheduler,omitempty"` - - // ControllerManager enables the controller manager logging. - // +optional - ControllerManager bool `json:"controllerManager,omitempty"` -} - -// MonitoringConfig defines the monitoring on Cluster. -type MonitoringConfig struct { - // SystemComponents enables the system component monitoring. - // +optional - SystemComponents bool `json:"systemComponents,omitempty"` - - // APIServer enables the api server monitoring. - // +optional - APIServer bool `json:"apiServer,omitempty"` - - // Scheduler enables the scheduler monitoring. - // +optional - Scheduler bool `json:"scheduler,omitempty"` - - // ControllerManager enables the controller manager monitoring. - // +optional - ControllerManager bool `json:"controllerManager,omitempty"` - - // EnableManagedPrometheus Enable Google Cloud Managed Service for Prometheus in the cluster. - // +optional - EnableManagedPrometheus bool `json:"enableManagedPrometheus,omitempty"` -} - // GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane. type GCPManagedControlPlaneSpec struct { // ClusterName allows you to specify the name of the GKE cluster. @@ -218,31 +125,6 @@ type GCPManagedControlPlaneSpec struct { // +optional ClusterNetwork *ClusterNetwork `json:"clusterNetwork,omitempty"` - // ClusterSecurity defines the cluster security. - // +optional - ClusterSecurity *ClusterSecurity `json:"clusterSecurity,omitempty"` - - // AddonsConfig defines the enabled Cluster Addons. - // +optional - AddonsConfig *AddonsConfig `json:"addonsConfig,omitempty"` - - // LoggingConfig defines the logging on Cluster. - // +optional - LoggingConfig *LoggingConfig `json:"loggingConfig,omitempty"` - - // MonitoringConfig defines the monitoring on Cluster. - // +optional - MonitoringConfig *MonitoringConfig `json:"monitoringConfig,omitempty"` - - // DefaultNodeLocation is the list of Google Compute Engine zones in which the cluster's Node should be located. - // +optional - DefaultNodeLocation []string `json:"defaultNodeLocation,omitempty"` - - // DefaultMaXPodsPerNode is the maximum number of pods can be run simultaneously on a Node, and only honored if - // Cluster is created with IP Alias support. - // +optional - DefaultMaxPodsPerNode int `json:"defaultMaxPodsPerNode,omitempty"` - // Project is the name of the project to deploy the cluster to. Project string `json:"project"` // Location represents the location (region or zone) in which the GKE cluster diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go index 31f6befc5..f70cde996 100644 --- a/exp/api/v1beta1/zz_generated.deepcopy.go +++ b/exp/api/v1beta1/zz_generated.deepcopy.go @@ -26,21 +26,6 @@ import ( cluster_apiapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" ) -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *AddonsConfig) DeepCopyInto(out *AddonsConfig) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AddonsConfig. -func (in *AddonsConfig) DeepCopy() *AddonsConfig { - if in == nil { - return nil - } - out := new(AddonsConfig) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthenticatorGroupConfig) DeepCopyInto(out *AuthenticatorGroupConfig) { *out = *in @@ -116,31 +101,6 @@ func (in *ClusterNetworkService) DeepCopy() *ClusterNetworkService { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterSecurity) DeepCopyInto(out *ClusterSecurity) { - *out = *in - if in.WorkloadIdentityConfig != nil { - in, out := &in.WorkloadIdentityConfig, &out.WorkloadIdentityConfig - *out = new(WorkloadIdentityConfig) - **out = **in - } - if in.AuthenticatorGroupConfig != nil { - in, out := &in.AuthenticatorGroupConfig, &out.AuthenticatorGroupConfig - *out = new(AuthenticatorGroupConfig) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSecurity. -func (in *ClusterSecurity) DeepCopy() *ClusterSecurity { - if in == nil { - return nil - } - out := new(ClusterSecurity) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GCPManagedCluster) DeepCopyInto(out *GCPManagedCluster) { *out = *in @@ -332,31 +292,6 @@ func (in *GCPManagedControlPlaneSpec) DeepCopyInto(out *GCPManagedControlPlaneSp *out = new(ClusterNetwork) (*in).DeepCopyInto(*out) } - if in.ClusterSecurity != nil { - in, out := &in.ClusterSecurity, &out.ClusterSecurity - *out = new(ClusterSecurity) - (*in).DeepCopyInto(*out) - } - if in.AddonsConfig != nil { - in, out := &in.AddonsConfig, &out.AddonsConfig - *out = new(AddonsConfig) - **out = **in - } - if in.LoggingConfig != nil { - in, out := &in.LoggingConfig, &out.LoggingConfig - *out = new(LoggingConfig) - **out = **in - } - if in.MonitoringConfig != nil { - in, out := &in.MonitoringConfig, &out.MonitoringConfig - *out = new(MonitoringConfig) - **out = **in - } - if in.DefaultNodeLocation != nil { - in, out := &in.DefaultNodeLocation, &out.DefaultNodeLocation - *out = make([]string, len(*in)) - copy(*out, *in) - } if in.ReleaseChannel != nil { in, out := &in.ReleaseChannel, &out.ReleaseChannel *out = new(ReleaseChannel) @@ -614,21 +549,6 @@ func (in *LinuxNodeConfig) DeepCopy() *LinuxNodeConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LoggingConfig) DeepCopyInto(out *LoggingConfig) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LoggingConfig. -func (in *LoggingConfig) DeepCopy() *LoggingConfig { - if in == nil { - return nil - } - out := new(LoggingConfig) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MasterAuthorizedNetworksConfig) DeepCopyInto(out *MasterAuthorizedNetworksConfig) { *out = *in @@ -675,21 +595,6 @@ func (in *MasterAuthorizedNetworksConfigCidrBlock) DeepCopy() *MasterAuthorizedN return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MonitoringConfig) DeepCopyInto(out *MonitoringConfig) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MonitoringConfig. -func (in *MonitoringConfig) DeepCopy() *MonitoringConfig { - if in == nil { - return nil - } - out := new(MonitoringConfig) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeNetworkConfig) DeepCopyInto(out *NodeNetworkConfig) { *out = *in diff --git a/hack/tools/go.mod b/hack/tools/go.mod index d448c867b..33f09d766 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api-provider-gcp/hack/tools -go 1.21.10 +go 1.21 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.2 From ed3de0a75016f2272627a74895734be80fd15048 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 24 Jun 2024 12:00:11 +0200 Subject: [PATCH 08/28] drop failing and not in use job Signed-off-by: cpanato --- .github/workflows/cover.yaml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/cover.yaml diff --git a/.github/workflows/cover.yaml b/.github/workflows/cover.yaml deleted file mode 100644 index c66fa60f4..000000000 --- a/.github/workflows/cover.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# add public code coverage reports -name: coverage - -on: - push: - branches: - - main - -jobs: - coverage: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - run: "make test-cover" - - - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 - with: - file: ./coverage.out - fail_ci_if_error: true From af6f6c1b6d9c14499e049df452b018754abd1e58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 18:50:40 +0000 Subject: [PATCH 09/28] Bump the all group with 2 updates Bumps the all group with 2 updates: [github.com/googleapis/gax-go/v2](https://github.com/googleapis/gax-go) and [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Updates `github.com/googleapis/gax-go/v2` from 2.12.4 to 2.12.5 - [Release notes](https://github.com/googleapis/gax-go/releases) - [Commits](https://github.com/googleapis/gax-go/compare/v2.12.4...v2.12.5) Updates `google.golang.org/api` from 0.184.0 to 0.185.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.184.0...v0.185.0) --- updated-dependencies: - dependency-name: github.com/googleapis/gax-go/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 6c2ffef7a..bb8075e15 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 - github.com/googleapis/gax-go/v2 v2.12.4 + github.com/googleapis/gax-go/v2 v2.12.5 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/pkg/errors v0.9.1 @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.24.0 golang.org/x/mod v0.18.0 golang.org/x/net v0.26.0 - google.golang.org/api v0.184.0 + google.golang.org/api v0.185.0 google.golang.org/grpc v1.64.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -41,7 +41,7 @@ require ( ) require ( - cloud.google.com/go v0.114.0 // indirect + cloud.google.com/go v0.115.0 // indirect cloud.google.com/go/auth v0.5.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect @@ -156,10 +156,10 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index d3a17e510..c2de77149 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.114.0 h1:OIPFAdfrFDFO2ve2U7r/H5SwSbBzEdrBdE7xkgwc+kY= -cloud.google.com/go v0.114.0/go.mod h1:ZV9La5YYxctro1HTPug5lXH/GefROyW8PPD4T8n9J8E= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= cloud.google.com/go/auth v0.5.1 h1:0QNO7VThG54LUzKiQxv8C6x1YX7lUrzlAa1nVLF8CIw= cloud.google.com/go/auth v0.5.1/go.mod h1:vbZT8GjzDf3AVqCcQmqeeM32U9HBFc32vVVAbwDsa6s= cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= @@ -180,8 +180,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.4 h1:9gWcmF85Wvq4ryPFvGFaOgPIs1AQX0d0bcbGw4Z96qg= -github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI= +github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA= +github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= @@ -456,19 +456,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.184.0 h1:dmEdk6ZkJNXy1JcDhn/ou0ZUq7n9zropG2/tR4z+RDg= -google.golang.org/api v0.184.0/go.mod h1:CeDTtUEiYENAf8PPG5VZW2yNp2VM3VWbCeTioAZBTBA= +google.golang.org/api v0.185.0 h1:ENEKk1k4jW8SmmaT6RE+ZasxmxezCrD5Vw4npvr+pAU= +google.golang.org/api v0.185.0/go.mod h1:HNfvIkJGlgrIlrbYkAm9W9IdkmKZjOTVh33YltygGbg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 h1:HCZ6DlkKtCDAtD8ForECsY3tKuaR+p4R3grlK80uCCc= -google.golang.org/genproto v0.0.0-20240604185151-ef581f913117/go.mod h1:lesfX/+9iA+3OdqeCpoDddJaNxVB1AB6tD7EfqMmprc= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 h1:CUiCqkPw1nNrNQzCCG4WA65m0nAmQiwXHpub3dNyruU= +google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4/go.mod h1:EvuUDCulqGgV80RvP1BHuom+smhX4qtlhnNatHuroGQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 h1:QW9+G6Fir4VcRXVH8x3LilNAb6cxBGLa6+GM4hRwexE= +google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3/go.mod h1:kdrSS/OiLkPrNUpzD4aHgCq2rVuC/YRxok32HXZ4vRE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 h1:Di6ANFilr+S60a4S61ZM00vLdw0IrQOSMS2/6mrnOU0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -485,8 +485,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 23e3d97462b2da37685cbee22f77a70178c11873 Mon Sep 17 00:00:00 2001 From: Mohamed Belgaied Hassine Date: Tue, 25 Jun 2024 23:03:12 +0200 Subject: [PATCH 10/28] Adding support for DisableDefaultSNAT and MasterAuthorizedNetworksConfig for private GKE clusters and removing non-urgent API additions Signed-off-by: Mohamed Belgaied Hassine --- cloud/services/container/clusters/reconcile.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go index 4ef595080..dfb8cfca3 100644 --- a/cloud/services/container/clusters/reconcile.go +++ b/cloud/services/container/clusters/reconcile.go @@ -275,6 +275,11 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error { if cn.PrivateCluster != nil { cluster.PrivateClusterConfig = &containerpb.PrivateClusterConfig{} cluster.PrivateClusterConfig.EnablePrivateEndpoint = cn.PrivateCluster.EnablePrivateEndpoint + if cn.PrivateCluster.EnablePrivateEndpoint { + cluster.MasterAuthorizedNetworksConfig = &containerpb.MasterAuthorizedNetworksConfig{ + Enabled: true, + } + } cluster.PrivateClusterConfig.EnablePrivateNodes = cn.PrivateCluster.EnablePrivateNodes cluster.PrivateClusterConfig.MasterIpv4CidrBlock = cn.PrivateCluster.ControlPlaneCidrBlock @@ -282,7 +287,11 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error { Enabled: cn.PrivateCluster.ControlPlaneGlobalAccess, } - // TODO(Akshay): Set Default SNAT + cluster.NetworkConfig = &containerpb.NetworkConfig{ + DefaultSnatStatus: &containerpb.DefaultSnatStatus{ + Disabled: cn.PrivateCluster.DisableDefaultSNAT, + }, + } } } if !s.scope.IsAutopilotCluster() { From 822ae0687641e47c1b9c5c947582acbc1ddbfd75 Mon Sep 17 00:00:00 2001 From: Mohamed Belgaied Hassine Date: Tue, 25 Jun 2024 23:09:44 +0200 Subject: [PATCH 11/28] Removed a temporary change to config YAMLs Signed-off-by: Mohamed Belgaied Hassine --- config/default/manager_prometheus_metrics_patch.yaml | 4 ++-- config/manager/manager.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/default/manager_prometheus_metrics_patch.yaml b/config/default/manager_prometheus_metrics_patch.yaml index 5e0c3c4d5..0b96c6813 100644 --- a/config/default/manager_prometheus_metrics_patch.yaml +++ b/config/default/manager_prometheus_metrics_patch.yaml @@ -11,9 +11,9 @@ spec: prometheus.io/scrape: 'true' spec: containers: - Expose the prometheus metrics on default port + # Expose the prometheus metrics on default port - name: manager ports: - containerPort: 8080 - name: metrics2 + name: metrics protocol: TCP diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 6d92245d2..7391b4bf7 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -33,7 +33,7 @@ spec: name: healthz protocol: TCP - containerPort: 8443 - name: metrics-2 + name: metrics protocol: TCP readinessProbe: httpGet: From 9112c32adb4f3914dc5d142e42a16dd0c042fe83 Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Thu, 27 Jun 2024 15:48:05 -0400 Subject: [PATCH 12/28] Set Labels on Disks and ForwardingRules resources The Labels field should be set on Disks and ForwardingRules resources from the machine or cluster AdditionalLabels field, similar to how it is set on Instances. --- cloud/scope/cluster.go | 1 + cloud/scope/machine.go | 1 + .../compute/instances/reconcile_test.go | 27 ++++++++++ .../compute/loadbalancers/reconcile_test.go | 50 ++++++++++++++++++- 4 files changed, 78 insertions(+), 1 deletion(-) diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go index 7e4e36b00..e7add68c1 100644 --- a/cloud/scope/cluster.go +++ b/cloud/scope/cluster.go @@ -337,6 +337,7 @@ func (s *ClusterScope) ForwardingRuleSpec(lbname string) *compute.ForwardingRule IPProtocol: "TCP", LoadBalancingScheme: "EXTERNAL", PortRange: portRange, + Labels: s.AdditionalLabels(), } } diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go index 695160bd1..96f745822 100644 --- a/cloud/scope/machine.go +++ b/cloud/scope/machine.go @@ -249,6 +249,7 @@ func (m *MachineScope) InstanceImageSpec() *compute.AttachedDisk { DiskType: path.Join("zones", m.Zone(), "diskTypes", string(diskType)), ResourceManagerTags: shared.ResourceTagConvert(context.TODO(), m.GCPMachine.Spec.ResourceManagerTags), SourceImage: sourceImage, + Labels: m.ClusterGetter.AdditionalLabels().AddLabels(m.GCPMachine.Spec.AdditionalLabels), }, } diff --git a/cloud/services/compute/instances/reconcile_test.go b/cloud/services/compute/instances/reconcile_test.go index fba51b7a6..74b33ba8b 100644 --- a/cloud/services/compute/instances/reconcile_test.go +++ b/cloud/services/compute/instances/reconcile_test.go @@ -237,6 +237,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -302,6 +305,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -369,6 +375,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -436,6 +445,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -506,6 +518,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -569,6 +584,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-a/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, }, }, @@ -639,6 +657,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, DiskEncryptionKey: &compute.CustomerEncryptionKey{ KmsKeyName: "projects/my-project/locations/us-central1/keyRings/us-central1/cryptoKeys/some-key", @@ -712,6 +733,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, DiskEncryptionKey: &compute.CustomerEncryptionKey{ RawKey: "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=", @@ -785,6 +809,9 @@ func TestService_createOrGetInstance(t *testing.T) { DiskType: "zones/us-central1-c/diskTypes/pd-standard", SourceImage: "projects/my-proj/global/images/family/capi-ubuntu-1804-k8s-v1-19", ResourceManagerTags: map[string]string{}, + Labels: map[string]string{ + "foo": "bar", + }, }, DiskEncryptionKey: &compute.CustomerEncryptionKey{ RsaEncryptedKey: "ieCx/NcW06PcT7Ep1X6LUTc/hLvUDYyzSZPPVCVPTVEohpeHASqC8uw5TzyO9U+Fka9JFHiz0mBibXUInrC/jEk014kCK/NPjYgEMOyssZ4ZINPKxlUh2zn1bV+MCaTICrdmuSBTWlUUiFoDiD6PYznLwh8ZNdaheCeZ8ewEXgFQ8V+sDroLaN3Xs3MDTXQEMMoNUXMCZEIpg9Vtp9x2oe==", diff --git a/cloud/services/compute/loadbalancers/reconcile_test.go b/cloud/services/compute/loadbalancers/reconcile_test.go index 3572ae1ea..304e26d6f 100644 --- a/cloud/services/compute/loadbalancers/reconcile_test.go +++ b/cloud/services/compute/loadbalancers/reconcile_test.go @@ -95,6 +95,18 @@ func getBaseClusterScope() (*scope.ClusterScope, error) { return clusterScope, nil } +func getBaseClusterScopeWithLabels() (*scope.ClusterScope, error) { + clusterScope, err := getBaseClusterScope() + if err != nil { + return nil, err + } + + clusterScope.GCPCluster.Spec.AdditionalLabels = map[string]string{ + "foo": "bar", + } + return clusterScope, nil +} + func TestService_createOrGetInstanceGroup(t *testing.T) { tests := []struct { name string @@ -596,6 +608,7 @@ func TestService_createOrGetForwardingRule(t *testing.T) { mockForwardingRule *cloud.MockGlobalForwardingRules want *compute.ForwardingRule wantErr bool + includeLabels bool }{ { name: "forwarding rule does not exist for external load balancer (should create forwardingrule)", @@ -622,11 +635,46 @@ func TestService_createOrGetForwardingRule(t *testing.T) { SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/global/forwardingRules/my-cluster-apiserver", }, }, + { + name: "forwarding rule does not exist for external load balancer (should create forwardingrule with labels)", + scope: func(s *scope.ClusterScope) Scope { return s }, + lbName: infrav1.APIServerRoleTagValue, + address: &compute.Address{ + Name: "my-cluster-apiserver", + SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/regions/us-central1/addresses/my-cluster-apiserver", + }, + backendService: &compute.BackendService{}, + targetTcpproxy: &compute.TargetTcpProxy{ + Name: "my-cluster-apiserver", + }, + mockForwardingRule: &cloud.MockGlobalForwardingRules{ + ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"}, + Objects: map[meta.Key]*cloud.MockGlobalForwardingRulesObj{}, + }, + want: &compute.ForwardingRule{ + IPAddress: "https://www.googleapis.com/compute/v1/projects/proj-id/regions/us-central1/addresses/my-cluster-apiserver", + IPProtocol: "TCP", + LoadBalancingScheme: "EXTERNAL", + PortRange: "443-443", + Name: "my-cluster-apiserver", + SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/global/forwardingRules/my-cluster-apiserver", + Labels: map[string]string{ + "foo": "bar", + }, + }, + includeLabels: true, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { ctx := context.TODO() - clusterScope, err := getBaseClusterScope() + var err error + var clusterScope *scope.ClusterScope + if tt.includeLabels { + clusterScope, err = getBaseClusterScopeWithLabels() + } else { + clusterScope, err = getBaseClusterScope() + } if err != nil { t.Fatal(err) } From d265963034f2cfab342d55f37f89c4e5f2f480f7 Mon Sep 17 00:00:00 2001 From: Tasdik Rahman Date: Mon, 1 Jul 2024 18:08:27 +0200 Subject: [PATCH 13/28] feat: Add minimum value for MTU to be 1300 and maximum to be 8896 --- api/v1beta1/types.go | 10 +++++++--- .../infrastructure.cluster.x-k8s.io_gcpclusters.yaml | 10 +++++++--- ...structure.cluster.x-k8s.io_gcpclustertemplates.yaml | 10 +++++++--- ...astructure.cluster.x-k8s.io_gcpmanagedclusters.yaml | 10 +++++++--- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index 957136084..bfb10e349 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -137,9 +137,13 @@ type NetworkSpec struct { // +optional HostProject *string `json:"hostProject,omitempty"` - // Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through - // this interconnect attachment. Only 1440 and 1500 are allowed. If not - // specified, the value will default to 1440. + // Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is + // 1300 and the maximum value is 8896. The suggested value is 1500, which is + // the default MTU used on the Internet, or 8896 if you want to use Jumbo + // frames. If unspecified, the value defaults to 1460. + // More info: https://pkg.go.dev/google.golang.org/api/compute/v1#Network + // +kubebuilder:validation:Minimum:=1300 + // +kubebuilder:validation:Maximum:=8896 // +optional Mtu int64 `json:"mtu,omitempty"` } diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml index 09ecb0c36..5ef715079 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml @@ -170,10 +170,14 @@ spec: type: integer mtu: description: |- - Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through - this interconnect attachment. Only 1440 and 1500 are allowed. If not - specified, the value will default to 1440. + Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is + 1300 and the maximum value is 8896. The suggested value is 1500, which is + the default MTU used on the Internet, or 8896 if you want to use Jumbo + frames. If unspecified, the value defaults to 1460. + More info: https://pkg.go.dev/google.golang.org/api/compute/v1#Network format: int64 + maximum: 8896 + minimum: 1300 type: integer name: description: Name is the name of the network to be used. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml index 66d8ddbca..d5f6d8587 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml @@ -187,10 +187,14 @@ spec: type: integer mtu: description: |- - Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through - this interconnect attachment. Only 1440 and 1500 are allowed. If not - specified, the value will default to 1440. + Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is + 1300 and the maximum value is 8896. The suggested value is 1500, which is + the default MTU used on the Internet, or 8896 if you want to use Jumbo + frames. If unspecified, the value defaults to 1460. + More info: https://pkg.go.dev/google.golang.org/api/compute/v1#Network format: int64 + maximum: 8896 + minimum: 1300 type: integer name: description: Name is the name of the network to be used. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml index ddb174495..dc7ba5de6 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml @@ -166,10 +166,14 @@ spec: type: integer mtu: description: |- - Mtu: Maximum Transmission Unit (MTU), in bytes, of packets passing through - this interconnect attachment. Only 1440 and 1500 are allowed. If not - specified, the value will default to 1440. + Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is + 1300 and the maximum value is 8896. The suggested value is 1500, which is + the default MTU used on the Internet, or 8896 if you want to use Jumbo + frames. If unspecified, the value defaults to 1460. + More info: https://pkg.go.dev/google.golang.org/api/compute/v1#Network format: int64 + maximum: 8896 + minimum: 1300 type: integer name: description: Name is the name of the network to be used. From f3ac586a36c9a3ee03a595916a91bc364790b6e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:07:22 +0000 Subject: [PATCH 14/28] Bump the all group with 6 updates Bumps the all group with 6 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.0` | `1.27.1` | | [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go) | `1.37.0` | `1.37.1` | | [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go) | `1.1.8` | `1.1.9` | | [cloud.google.com/go/resourcemanager](https://github.com/googleapis/google-cloud-go) | `1.9.7` | `1.9.8` | | [github.com/GoogleCloudPlatform/k8s-cloud-provider](https://github.com/GoogleCloudPlatform/k8s-cloud-provider) | `1.30.0` | `1.30.1` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.185.0` | `0.186.0` | Updates `cloud.google.com/go/compute` from 1.27.0 to 1.27.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.27.0...pubsub/v1.27.1) Updates `cloud.google.com/go/container` from 1.37.0 to 1.37.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.37.0...container/v1.37.1) Updates `cloud.google.com/go/iam` from 1.1.8 to 1.1.9 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.8...iam/v1.1.9) Updates `cloud.google.com/go/resourcemanager` from 1.9.7 to 1.9.8 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iap/v1.9.7...webrisk/v1.9.8) Updates `github.com/GoogleCloudPlatform/k8s-cloud-provider` from 1.30.0 to 1.30.1 - [Release notes](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/releases) - [Commits](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/compare/v1.30.0...v1.30.1) Updates `google.golang.org/api` from 0.185.0 to 0.186.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.185.0...v0.186.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/GoogleCloudPlatform/k8s-cloud-provider dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index bb8075e15..754850e6f 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ replace ( ) require ( - cloud.google.com/go/compute v1.27.0 - cloud.google.com/go/container v1.37.0 - cloud.google.com/go/iam v1.1.8 - cloud.google.com/go/resourcemanager v1.9.7 - github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 + cloud.google.com/go/compute v1.27.1 + cloud.google.com/go/container v1.37.1 + cloud.google.com/go/iam v1.1.9 + cloud.google.com/go/resourcemanager v1.9.8 + github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.12.5 @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.24.0 golang.org/x/mod v0.18.0 golang.org/x/net v0.26.0 - google.golang.org/api v0.185.0 + google.golang.org/api v0.186.0 google.golang.org/grpc v1.64.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -42,7 +42,7 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.5.1 // indirect + cloud.google.com/go/auth v0.6.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect @@ -157,7 +157,7 @@ require ( golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index c2de77149..d22893619 100644 --- a/go.sum +++ b/go.sum @@ -1,29 +1,29 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.5.1 h1:0QNO7VThG54LUzKiQxv8C6x1YX7lUrzlAa1nVLF8CIw= -cloud.google.com/go/auth v0.5.1/go.mod h1:vbZT8GjzDf3AVqCcQmqeeM32U9HBFc32vVVAbwDsa6s= +cloud.google.com/go/auth v0.6.0 h1:5x+d6b5zdezZ7gmLWD1m/xNjnaQ2YDhmIz/HH3doy1g= +cloud.google.com/go/auth v0.6.0/go.mod h1:b4acV+jLQDyjwm4OXHYjNvRi4jvGBzHWJRtJcy+2P4g= cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= -cloud.google.com/go/compute v1.27.0 h1:EGawh2RUnfHT5g8f/FX3Ds6KZuIBC77hZoDrBvEZw94= -cloud.google.com/go/compute v1.27.0/go.mod h1:LG5HwRmWFKM2C5XxHRiNzkLLXW48WwvyVC0mfWsYPOM= +cloud.google.com/go/compute v1.27.1 h1:0WbBLIPNANheCRZ4h8QhgzjN53KMutbiVBOLtPiVzBU= +cloud.google.com/go/compute v1.27.1/go.mod h1:UVWm+bWKEKoM+PW2sZycP1Jgk3NhKwR2Iy2Cnp/G40I= cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/container v1.37.0 h1:KZ5IbxnUNcTdBkMfZNum6z4tu61sFHf9Zk7Xl8RzWVI= -cloud.google.com/go/container v1.37.0/go.mod h1:AFsgViXsfLvZHsgHrWQqPqfAPjCwXrZmLjKJ64uhLIw= -cloud.google.com/go/iam v1.1.8 h1:r7umDwhj+BQyz0ScZMp4QrGXjSTI3ZINnpgU2nlB/K0= -cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE= +cloud.google.com/go/container v1.37.1 h1:9g/2zHz4yHeNPNCRsghWBVoZKcGxVaIEb9T0DXAg5gc= +cloud.google.com/go/container v1.37.1/go.mod h1:8zwisvfdwqsXB/0TSxoUhTrfTrlfDV0pK9hcDtyFQ1c= +cloud.google.com/go/iam v1.1.9 h1:oSkYLVtVme29uGYrOcKcvJRht7cHJpYD09GM9JaR0TE= +cloud.google.com/go/iam v1.1.9/go.mod h1:Nt1eDWNYH9nGQg3d/mY7U1hvfGmsaG9o/kLGoLoLXjQ= cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= -cloud.google.com/go/resourcemanager v1.9.7 h1:SdvD0PaPX60+yeKoSe16mawFpM0EPuiPPihTIVlhRsY= -cloud.google.com/go/resourcemanager v1.9.7/go.mod h1:cQH6lJwESufxEu6KepsoNAsjrUtYYNXRwxm4QFE5g8A= +cloud.google.com/go/resourcemanager v1.9.8 h1:LMFZspU5krxBIz3pXk0QTFnmdAwKN8hnq71vmHPVNKs= +cloud.google.com/go/resourcemanager v1.9.8/go.mod h1:L3cVnfsZ1Wsw4f9hBNmZ7O1/ahJRPn8Ltg03ifaqsIw= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 h1:yqDyLRXp11LGvQdtSfbdNrp9j1DY/1HWY0eCG7s3WKE= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0/go.mod h1:uxPncsxa4L5gn4hEsw96f74dH6NaGH2r5qMpfXKENIA= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1 h1:MKW77JQoE7tyVf2rxGFTvDJvmtl6ZHGjDpOaxJYx6vY= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1/go.mod h1:uxPncsxa4L5gn4hEsw96f74dH6NaGH2r5qMpfXKENIA= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -456,8 +456,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.185.0 h1:ENEKk1k4jW8SmmaT6RE+ZasxmxezCrD5Vw4npvr+pAU= -google.golang.org/api v0.185.0/go.mod h1:HNfvIkJGlgrIlrbYkAm9W9IdkmKZjOTVh33YltygGbg= +google.golang.org/api v0.186.0 h1:n2OPp+PPXX0Axh4GuSsL5QL8xQCTb2oDwyzPnQvqUug= +google.golang.org/api v0.186.0/go.mod h1:hvRbBmgoje49RV3xqVXrmP6w93n6ehGgIVPYrGtBFFc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -465,8 +465,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 h1:CUiCqkPw1nNrNQzCCG4WA65m0nAmQiwXHpub3dNyruU= google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4/go.mod h1:EvuUDCulqGgV80RvP1BHuom+smhX4qtlhnNatHuroGQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 h1:QW9+G6Fir4VcRXVH8x3LilNAb6cxBGLa6+GM4hRwexE= -google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3/go.mod h1:kdrSS/OiLkPrNUpzD4aHgCq2rVuC/YRxok32HXZ4vRE= +google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= +google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 h1:Di6ANFilr+S60a4S61ZM00vLdw0IrQOSMS2/6mrnOU0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From b0aaa8ff884e866d59fdbf2f976a72b2e455e621 Mon Sep 17 00:00:00 2001 From: Tasdik Rahman Date: Tue, 2 Jul 2024 11:01:23 +0200 Subject: [PATCH 15/28] chore: GCPCluster webhook: Throw error if MTU in the new incoming spec is more than 8896 bytes or lesser than 1300 bytes --- api/v1beta1/gcpcluster_webhook.go | 14 ++++ api/v1beta1/gcpcluster_webhook_test.go | 102 +++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 api/v1beta1/gcpcluster_webhook_test.go diff --git a/api/v1beta1/gcpcluster_webhook.go b/api/v1beta1/gcpcluster_webhook.go index bb353e752..d9f1a25a5 100644 --- a/api/v1beta1/gcpcluster_webhook.go +++ b/api/v1beta1/gcpcluster_webhook.go @@ -92,6 +92,20 @@ func (c *GCPCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, ) } + if c.Spec.Network.Mtu < int64(1300) { + allErrs = append(allErrs, + field.Invalid(field.NewPath("spec", "Network", "Mtu"), + c.Spec.Network.Mtu, "field cannot be lesser than 1300"), + ) + } + + if c.Spec.Network.Mtu > int64(8896) { + allErrs = append(allErrs, + field.Invalid(field.NewPath("spec", "Network", "Mtu"), + c.Spec.Network.Mtu, "field cannot be greater than 8896"), + ) + } + if len(allErrs) == 0 { return nil, nil } diff --git a/api/v1beta1/gcpcluster_webhook_test.go b/api/v1beta1/gcpcluster_webhook_test.go new file mode 100644 index 000000000..697b684bc --- /dev/null +++ b/api/v1beta1/gcpcluster_webhook_test.go @@ -0,0 +1,102 @@ +/* +Copyright 2021 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta1 + +import ( + "testing" + + . "github.com/onsi/gomega" +) + +func TestGCPCluster_ValidateUpdate(t *testing.T) { + g := NewWithT(t) + + tests := []struct { + name string + newCluster *GCPCluster + oldCluster *GCPCluster + wantErr bool + }{ + { + name: "GCPCluster with MTU field is within the limits of more than 1300 and less than 8896", + newCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(1500), + }, + }, + }, + oldCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(1400), + }, + }, + }, + wantErr: false, + }, + { + name: "GCPCluster with MTU field more than 8896", + newCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(10000), + }, + }, + }, + oldCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(1500), + }, + }, + }, + wantErr: true, + }, + { + name: "GCPCluster with MTU field less than 8896", + newCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(1250), + }, + }, + }, + oldCluster: &GCPCluster{ + Spec: GCPClusterSpec{ + Network: NetworkSpec{ + Mtu: int64(1500), + }, + }, + }, + wantErr: true, + }, + } + for _, test := range tests { + test := test + t.Run(test.name, func(t *testing.T) { + t.Parallel() + warn, err := test.newCluster.ValidateUpdate(test.oldCluster) + if test.wantErr { + g.Expect(err).To(HaveOccurred()) + } else { + g.Expect(err).NotTo(HaveOccurred()) + } + g.Expect(warn).To(BeNil()) + }) + } +} From e3a61fcdc231f4bb93de1005e9c386d613834416 Mon Sep 17 00:00:00 2001 From: Tasdik Rahman Date: Tue, 2 Jul 2024 11:17:09 +0200 Subject: [PATCH 16/28] chore: NetworkSpec: Add kubebuilder default of 1460 for MTU if not specified --- api/v1beta1/types.go | 1 + cloud/scope/cluster.go | 10 ++++++++-- .../infrastructure.cluster.x-k8s.io_gcpclusters.yaml | 1 + ...structure.cluster.x-k8s.io_gcpclustertemplates.yaml | 1 + ...astructure.cluster.x-k8s.io_gcpmanagedclusters.yaml | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index bfb10e349..762181f5a 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -144,6 +144,7 @@ type NetworkSpec struct { // More info: https://pkg.go.dev/google.golang.org/api/compute/v1#Network // +kubebuilder:validation:Minimum:=1300 // +kubebuilder:validation:Maximum:=8896 + // +kubebuilder:default:=1460 // +optional Mtu int64 `json:"mtu,omitempty"` } diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go index 5f3b80c62..cb54eadb7 100644 --- a/cloud/scope/cluster.go +++ b/cloud/scope/cluster.go @@ -132,10 +132,16 @@ func (s *ClusterScope) NetworkName() string { } // NetworkMtu returns the Network MTU of 1440 which is the default, otherwise returns back what is being set. -// https://cloud.google.com/vpc/docs/mtu +// Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is +// 1300 and the maximum value is 8896. The suggested value is 1500, which is +// the default MTU used on the Internet, or 8896 if you want to use Jumbo +// frames. If unspecified, the value defaults to 1460. +// More info +// - https://pkg.go.dev/google.golang.org/api/compute/v1#Network +// - https://cloud.google.com/vpc/docs/mtu func (s *ClusterScope) NetworkMtu() int64 { if s.GCPCluster.Spec.Network.Mtu == 0 { - return int64(1440) + return int64(1460) } return s.GCPCluster.Spec.Network.Mtu } diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml index 5ef715079..55b5a0ac3 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml @@ -169,6 +169,7 @@ spec: format: int32 type: integer mtu: + default: 1460 description: |- Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is 1300 and the maximum value is 8896. The suggested value is 1500, which is diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml index d5f6d8587..e93107878 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml @@ -186,6 +186,7 @@ spec: format: int32 type: integer mtu: + default: 1460 description: |- Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is 1300 and the maximum value is 8896. The suggested value is 1500, which is diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml index dc7ba5de6..21135edf3 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml @@ -165,6 +165,7 @@ spec: format: int32 type: integer mtu: + default: 1460 description: |- Mtu: Maximum Transmission Unit in bytes. The minimum value for this field is 1300 and the maximum value is 8896. The suggested value is 1500, which is From 4cbb3c24514a089a176f77b122fdd124cfd38cbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 18:51:29 +0000 Subject: [PATCH 17/28] Bump the all group with 9 updates Bumps the all group with 9 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.1` | `1.27.2` | | [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go) | `1.37.1` | `1.37.2` | | [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go) | `1.1.9` | `1.1.10` | | [cloud.google.com/go/resourcemanager](https://github.com/googleapis/google-cloud-go) | `1.9.8` | `1.9.9` | | [golang.org/x/crypto](https://github.com/golang/crypto) | `0.24.0` | `0.25.0` | | [golang.org/x/mod](https://github.com/golang/mod) | `0.18.0` | `0.19.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.26.0` | `0.27.0` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.186.0` | `0.187.0` | | [google.golang.org/grpc](https://github.com/grpc/grpc-go) | `1.64.0` | `1.65.0` | Updates `cloud.google.com/go/compute` from 1.27.1 to 1.27.2 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.27.1...compute/v1.27.2) Updates `cloud.google.com/go/container` from 1.37.1 to 1.37.2 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/container/v1.37.1...container/v1.37.2) Updates `cloud.google.com/go/iam` from 1.1.9 to 1.1.10 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.9...iam/v1.1.10) Updates `cloud.google.com/go/resourcemanager` from 1.9.8 to 1.9.9 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iap/v1.9.8...webrisk/v1.9.9) Updates `golang.org/x/crypto` from 0.24.0 to 0.25.0 - [Commits](https://github.com/golang/crypto/compare/v0.24.0...v0.25.0) Updates `golang.org/x/mod` from 0.18.0 to 0.19.0 - [Commits](https://github.com/golang/mod/compare/v0.18.0...v0.19.0) Updates `golang.org/x/net` from 0.26.0 to 0.27.0 - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.0) Updates `google.golang.org/api` from 0.186.0 to 0.187.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.186.0...v0.187.0) Updates `google.golang.org/grpc` from 1.64.0 to 1.65.0 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.64.0...v1.65.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 30 +++++++++++++-------------- go.sum | 64 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/go.mod b/go.mod index 754850e6f..2e3053428 100644 --- a/go.mod +++ b/go.mod @@ -11,10 +11,10 @@ replace ( ) require ( - cloud.google.com/go/compute v1.27.1 - cloud.google.com/go/container v1.37.1 - cloud.google.com/go/iam v1.1.9 - cloud.google.com/go/resourcemanager v1.9.8 + cloud.google.com/go/compute v1.27.2 + cloud.google.com/go/container v1.37.2 + cloud.google.com/go/iam v1.1.10 + cloud.google.com/go/resourcemanager v1.9.9 github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 @@ -24,11 +24,11 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.24.0 - golang.org/x/mod v0.18.0 - golang.org/x/net v0.26.0 - google.golang.org/api v0.186.0 - google.golang.org/grpc v1.64.0 + golang.org/x/crypto v0.25.0 + golang.org/x/mod v0.19.0 + golang.org/x/net v0.27.0 + google.golang.org/api v0.187.0 + google.golang.org/grpc v1.65.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 k8s.io/client-go v0.29.5 @@ -42,7 +42,7 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.6.0 // indirect + cloud.google.com/go/auth v0.6.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect @@ -88,7 +88,7 @@ require ( github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/docker v25.0.5+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect @@ -150,15 +150,15 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect; indirect// indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index d22893619..bf6f29afd 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,22 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.6.0 h1:5x+d6b5zdezZ7gmLWD1m/xNjnaQ2YDhmIz/HH3doy1g= -cloud.google.com/go/auth v0.6.0/go.mod h1:b4acV+jLQDyjwm4OXHYjNvRi4jvGBzHWJRtJcy+2P4g= +cloud.google.com/go/auth v0.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38= +cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4= cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= -cloud.google.com/go/compute v1.27.1 h1:0WbBLIPNANheCRZ4h8QhgzjN53KMutbiVBOLtPiVzBU= -cloud.google.com/go/compute v1.27.1/go.mod h1:UVWm+bWKEKoM+PW2sZycP1Jgk3NhKwR2Iy2Cnp/G40I= +cloud.google.com/go/compute v1.27.2 h1:5cE5hdrwJV/92ravlwIFRGnyH9CpLGhh4N0ZDVTU+BA= +cloud.google.com/go/compute v1.27.2/go.mod h1:YQuHkNEwP3bIz4LBYQqf4DIMfFtTDtnEgnwG0mJQQ9I= cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/container v1.37.1 h1:9g/2zHz4yHeNPNCRsghWBVoZKcGxVaIEb9T0DXAg5gc= -cloud.google.com/go/container v1.37.1/go.mod h1:8zwisvfdwqsXB/0TSxoUhTrfTrlfDV0pK9hcDtyFQ1c= -cloud.google.com/go/iam v1.1.9 h1:oSkYLVtVme29uGYrOcKcvJRht7cHJpYD09GM9JaR0TE= -cloud.google.com/go/iam v1.1.9/go.mod h1:Nt1eDWNYH9nGQg3d/mY7U1hvfGmsaG9o/kLGoLoLXjQ= +cloud.google.com/go/container v1.37.2 h1:g5zm1SUBZ+q7IvtI5hM/6xcpf2C/bFfN2EXzS07Iz9k= +cloud.google.com/go/container v1.37.2/go.mod h1:2ly7zpBmWtYjjuoB3fHyq8Gqrxaj2NIwzwVRpUcKYXk= +cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI= +cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps= cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= -cloud.google.com/go/resourcemanager v1.9.8 h1:LMFZspU5krxBIz3pXk0QTFnmdAwKN8hnq71vmHPVNKs= -cloud.google.com/go/resourcemanager v1.9.8/go.mod h1:L3cVnfsZ1Wsw4f9hBNmZ7O1/ahJRPn8Ltg03ifaqsIw= +cloud.google.com/go/resourcemanager v1.9.9 h1:9JgRo4uBdCLJpWb6c+1+q7QPyWzH0LSCKUcF/IliKNk= +cloud.google.com/go/resourcemanager v1.9.9/go.mod h1:vCBRKurJv+XVvRZ0XFhI/eBrBM7uBOPFjMEwSDMIflY= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -54,8 +54,8 @@ github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= @@ -128,8 +128,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= -github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= +github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -372,8 +372,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= @@ -383,8 +383,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -397,8 +397,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= @@ -424,13 +424,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -456,26 +456,26 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.186.0 h1:n2OPp+PPXX0Axh4GuSsL5QL8xQCTb2oDwyzPnQvqUug= -google.golang.org/api v0.186.0/go.mod h1:hvRbBmgoje49RV3xqVXrmP6w93n6ehGgIVPYrGtBFFc= +google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo= +google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 h1:CUiCqkPw1nNrNQzCCG4WA65m0nAmQiwXHpub3dNyruU= -google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4/go.mod h1:EvuUDCulqGgV80RvP1BHuom+smhX4qtlhnNatHuroGQ= +google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d h1:PksQg4dV6Sem3/HkBX+Ltq8T0ke0PKIRBNBatoDTVls= +google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M= google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 h1:Di6ANFilr+S60a4S61ZM00vLdw0IrQOSMS2/6mrnOU0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 58b9dc6fc11f9d06fc04d03c38189477eb8953f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:48:24 +0000 Subject: [PATCH 18/28] Bump actions/setup-go from 5.0.1 to 5.0.2 in the all group Bumps the all group with 1 update: [actions/setup-go](https://github.com/actions/setup-go). Updates `actions/setup-go` from 5.0.1 to 5.0.2 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/cdcb36043654635271a94b9a6d1392de5bb323a7...0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 04f1dc416..3a985f9b4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: "1.21" check-latest: true From 0207069efe02b3d13c277879828b642b99145737 Mon Sep 17 00:00:00 2001 From: Shawn Warren Date: Mon, 1 Jul 2024 11:03:31 -0500 Subject: [PATCH 19/28] feat: add sharedvpc support for lb subnet fix: set cloudScope for regionalhc and tgttcpproxies add test for lb w/ shared vpc add more test cases revert regionlhc and targettcpproxies --- .../compute/loadbalancers/reconcile_test.go | 73 ++++++++++++++++++- .../services/compute/loadbalancers/service.go | 7 +- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/cloud/services/compute/loadbalancers/reconcile_test.go b/cloud/services/compute/loadbalancers/reconcile_test.go index 304e26d6f..e24d3c545 100644 --- a/cloud/services/compute/loadbalancers/reconcile_test.go +++ b/cloud/services/compute/loadbalancers/reconcile_test.go @@ -107,6 +107,16 @@ func getBaseClusterScopeWithLabels() (*scope.ClusterScope, error) { return clusterScope, nil } +func getBaseClusterScopeWithSharedVPC() (*scope.ClusterScope, error) { + clusterScope, err := getBaseClusterScope() + if err != nil { + return nil, err + } + + clusterScope.GCPCluster.Spec.Network.HostProject = ptr.To("my-shared-vpc-project") + return clusterScope, nil +} + func TestService_createOrGetInstanceGroup(t *testing.T) { tests := []struct { name string @@ -451,6 +461,7 @@ func TestService_createOrGetAddress(t *testing.T) { mockAddress *cloud.MockGlobalAddresses want *compute.Address wantErr bool + sharedVPC bool }{ { name: "address does not exist for external load balancer (should create address)", @@ -467,11 +478,33 @@ func TestService_createOrGetAddress(t *testing.T) { AddressType: "EXTERNAL", }, }, + { + name: "address does not exist for external load balancer in shared VPC (should create address)", + scope: func(s *scope.ClusterScope) Scope { return s }, + lbName: infrav1.APIServerRoleTagValue, + mockAddress: &cloud.MockGlobalAddresses{ + ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"}, + Objects: map[meta.Key]*cloud.MockGlobalAddressesObj{}, + }, + want: &compute.Address{ + IpVersion: "IPV4", + Name: "my-cluster-apiserver", + SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/global/addresses/my-cluster-apiserver", + AddressType: "EXTERNAL", + }, + sharedVPC: true, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { ctx := context.TODO() - clusterScope, err := getBaseClusterScope() + var err error + var clusterScope *scope.ClusterScope + if tt.sharedVPC { + clusterScope, err = getBaseClusterScopeWithSharedVPC() + } else { + clusterScope, err = getBaseClusterScope() + } if err != nil { t.Fatal(err) } @@ -498,6 +531,7 @@ func TestService_createOrGetInternalAddress(t *testing.T) { mockSubnetworks *cloud.MockSubnetworks want *compute.Address wantErr bool + sharedVPC bool }{ { name: "address does not exist for internal load balancer (should create address)", @@ -527,11 +561,46 @@ func TestService_createOrGetInternalAddress(t *testing.T) { Purpose: "GCE_ENDPOINT", }, }, + { + name: "address does not exist for internal load balancer using SharedVPC subnet (should create address)", + scope: func(s *scope.ClusterScope) Scope { + s.GCPCluster.Spec.LoadBalancer = infrav1.LoadBalancerSpec{ + LoadBalancerType: &lbTypeInternal, + } + return s + }, + lbName: infrav1.InternalRoleTagValue, + mockAddress: &cloud.MockAddresses{ + ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"}, + Objects: map[meta.Key]*cloud.MockAddressesObj{}, + }, + mockSubnetworks: &cloud.MockSubnetworks{ + ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"}, + Objects: map[meta.Key]*cloud.MockSubnetworksObj{ + *meta.RegionalKey("control-plane", "us-central1"): {}, + }, + }, + want: &compute.Address{ + IpVersion: "IPV4", + Name: "my-cluster-api-internal", + Region: "us-central1", + SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/regions/us-central1/addresses/my-cluster-api-internal", + AddressType: "INTERNAL", + Purpose: "GCE_ENDPOINT", + }, + sharedVPC: true, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { ctx := context.TODO() - clusterScope, err := getBaseClusterScope() + var err error + var clusterScope *scope.ClusterScope + if tt.sharedVPC { + clusterScope, err = getBaseClusterScopeWithSharedVPC() + } else { + clusterScope, err = getBaseClusterScope() + } if err != nil { t.Fatal(err) } diff --git a/cloud/services/compute/loadbalancers/service.go b/cloud/services/compute/loadbalancers/service.go index 276fd2515..8a9f7da38 100644 --- a/cloud/services/compute/loadbalancers/service.go +++ b/cloud/services/compute/loadbalancers/service.go @@ -101,6 +101,11 @@ var _ cloud.Reconciler = &Service{} // New returns Service from given scope. func New(scope Scope) *Service { + cloudScope := scope.Cloud() + if scope.IsSharedVpc() { + cloudScope = scope.NetworkCloud() + } + return &Service{ scope: scope, addresses: scope.Cloud().GlobalAddresses(), @@ -113,6 +118,6 @@ func New(scope Scope) *Service { regionalhealthchecks: scope.Cloud().RegionHealthChecks(), instancegroups: scope.Cloud().InstanceGroups(), targettcpproxies: scope.Cloud().TargetTcpProxies(), - subnets: scope.Cloud().Subnetworks(), + subnets: cloudScope.Subnetworks(), } } From e7bcd4d3f52a349451a3723111c663fba0e5e169 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 18:16:57 +0000 Subject: [PATCH 20/28] Bump the all group with 6 updates Bumps the all group with 6 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.2` | `1.27.3` | | [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go) | `1.37.2` | `1.37.3` | | [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go) | `1.1.10` | `1.1.11` | | [cloud.google.com/go/resourcemanager](https://github.com/googleapis/google-cloud-go) | `1.9.9` | `1.9.10` | | [github.com/GoogleCloudPlatform/k8s-cloud-provider](https://github.com/GoogleCloudPlatform/k8s-cloud-provider) | `1.30.1` | `1.31.0` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.187.0` | `0.188.0` | Updates `cloud.google.com/go/compute` from 1.27.2 to 1.27.3 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/compute/v1.27.2...compute/v1.27.3) Updates `cloud.google.com/go/container` from 1.37.2 to 1.37.3 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/container/v1.37.2...container/v1.37.3) Updates `cloud.google.com/go/iam` from 1.1.10 to 1.1.11 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.10...iam/v1.1.11) Updates `cloud.google.com/go/resourcemanager` from 1.9.9 to 1.9.10 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iap/v1.9.9...webrisk/v1.9.10) Updates `github.com/GoogleCloudPlatform/k8s-cloud-provider` from 1.30.1 to 1.31.0 - [Release notes](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/releases) - [Commits](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/compare/v1.30.1...v1.31.0) Updates `google.golang.org/api` from 0.187.0 to 0.188.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.187.0...v0.188.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/GoogleCloudPlatform/k8s-cloud-provider dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 24 ++++++++++++------------ go.sum | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 2e3053428..17120d662 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ replace ( ) require ( - cloud.google.com/go/compute v1.27.2 - cloud.google.com/go/container v1.37.2 - cloud.google.com/go/iam v1.1.10 - cloud.google.com/go/resourcemanager v1.9.9 - github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1 + cloud.google.com/go/compute v1.27.3 + cloud.google.com/go/container v1.37.3 + cloud.google.com/go/iam v1.1.11 + cloud.google.com/go/resourcemanager v1.9.10 + github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.12.5 @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.25.0 golang.org/x/mod v0.19.0 golang.org/x/net v0.27.0 - google.golang.org/api v0.187.0 + google.golang.org/api v0.188.0 google.golang.org/grpc v1.65.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -42,9 +42,9 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.6.1 // indirect + cloud.google.com/go/auth v0.7.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect - cloud.google.com/go/longrunning v0.5.7 // indirect + cloud.google.com/go/longrunning v0.5.9 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect @@ -76,7 +76,7 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.3.0 // indirect + cloud.google.com/go/compute/metadata v0.4.0 // indirect github.com/BurntSushi/toml v1.0.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -156,9 +156,9 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect + google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index bf6f29afd..8cee8e88a 100644 --- a/go.sum +++ b/go.sum @@ -1,29 +1,29 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38= -cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4= +cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= +cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= -cloud.google.com/go/compute v1.27.2 h1:5cE5hdrwJV/92ravlwIFRGnyH9CpLGhh4N0ZDVTU+BA= -cloud.google.com/go/compute v1.27.2/go.mod h1:YQuHkNEwP3bIz4LBYQqf4DIMfFtTDtnEgnwG0mJQQ9I= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/container v1.37.2 h1:g5zm1SUBZ+q7IvtI5hM/6xcpf2C/bFfN2EXzS07Iz9k= -cloud.google.com/go/container v1.37.2/go.mod h1:2ly7zpBmWtYjjuoB3fHyq8Gqrxaj2NIwzwVRpUcKYXk= -cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI= -cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps= -cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= -cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= -cloud.google.com/go/resourcemanager v1.9.9 h1:9JgRo4uBdCLJpWb6c+1+q7QPyWzH0LSCKUcF/IliKNk= -cloud.google.com/go/resourcemanager v1.9.9/go.mod h1:vCBRKurJv+XVvRZ0XFhI/eBrBM7uBOPFjMEwSDMIflY= +cloud.google.com/go/compute v1.27.3 h1:GFfoejA5qGeFYpKAfgoVzvgJ3D8upFKI/UR7MdiPdS0= +cloud.google.com/go/compute v1.27.3/go.mod h1:5GuDo3l1k9CFhfIHK1sXqlqOW/iWX4/eBlO5FtxDhvQ= +cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c= +cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M= +cloud.google.com/go/container v1.37.3 h1:FCKTPz9OtId4LzB7dXzp+bDP4G0vlQOdUSYn2MddF38= +cloud.google.com/go/container v1.37.3/go.mod h1:XKwtVfsTBsnZ9Ve1Pw2wkjk5kSjJqsHl3oBrbbi4w/M= +cloud.google.com/go/iam v1.1.11 h1:0mQ8UKSfdHLut6pH9FM3bI55KWR46ketn0PuXleDyxw= +cloud.google.com/go/iam v1.1.11/go.mod h1:biXoiLWYIKntto2joP+62sd9uW5EpkZmKIvfNcTWlnQ= +cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k= +cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= +cloud.google.com/go/resourcemanager v1.9.10 h1:++wnwx8jD5cCtUH/wQT5nAswv37M9rwyjwVOcIgJOIY= +cloud.google.com/go/resourcemanager v1.9.10/go.mod h1:UJ5zGD2ZD+Ng3MNxkU1fwBbpJQEQE1UctqpvV5pbP1M= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1 h1:MKW77JQoE7tyVf2rxGFTvDJvmtl6ZHGjDpOaxJYx6vY= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.1/go.mod h1:uxPncsxa4L5gn4hEsw96f74dH6NaGH2r5qMpfXKENIA= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 h1:TW1ZnI8ORnfgWTmCBFoAjsO/9lTZkX2qdOgNwNEUsr8= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0/go.mod h1:YfY22pJ6JLsoo7QMouyfz+45Mb8RCwZdEIrie1teCpk= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -456,19 +456,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo= -google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk= +google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= +google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d h1:PksQg4dV6Sem3/HkBX+Ltq8T0ke0PKIRBNBatoDTVls= -google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M= -google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= -google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From e9eda6e401e8ebefdb4d05ff8d372a3d6ff8ab20 Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Fri, 28 Jun 2024 15:44:46 -0400 Subject: [PATCH 21/28] Use SetLabels() to set ForwardingRules labels The ForwardingRules resource requires that the SetLabels() method be used to add the labels after the resource has been created. --- .../compute/loadbalancers/reconcile.go | 24 +++++++++++++++++++ .../services/compute/loadbalancers/service.go | 10 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/cloud/services/compute/loadbalancers/reconcile.go b/cloud/services/compute/loadbalancers/reconcile.go index 86280e7a9..2e7acb349 100644 --- a/cloud/services/compute/loadbalancers/reconcile.go +++ b/cloud/services/compute/loadbalancers/reconcile.go @@ -579,6 +579,18 @@ func (s *Service) createOrGetForwardingRule(ctx context.Context, lbname string, } } + // Labels on ForwardingRules must be added after resource is created + labels := s.scope.AdditionalLabels() + if !labels.Equals(forwarding.Labels) { + setLabelsRequest := &compute.GlobalSetLabelsRequest{ + LabelFingerprint: forwarding.LabelFingerprint, + Labels: labels, + } + if err = s.forwardingrules.SetLabels(ctx, key, setLabelsRequest); err != nil { + return nil, err + } + } + return forwarding, nil } @@ -622,6 +634,18 @@ func (s *Service) createOrGetRegionalForwardingRule(ctx context.Context, lbname } } + // Labels on ForwardingRules must be added after resource is created + labels := s.scope.AdditionalLabels() + if !labels.Equals(forwarding.Labels) { + setLabelsRequest := &compute.RegionSetLabelsRequest{ + LabelFingerprint: forwarding.LabelFingerprint, + Labels: labels, + } + if err = s.regionalforwardingrules.SetLabels(ctx, key, setLabelsRequest); err != nil { + return nil, err + } + } + return forwarding, nil } diff --git a/cloud/services/compute/loadbalancers/service.go b/cloud/services/compute/loadbalancers/service.go index 276fd2515..aa1285413 100644 --- a/cloud/services/compute/loadbalancers/service.go +++ b/cloud/services/compute/loadbalancers/service.go @@ -44,6 +44,14 @@ type forwardingrulesInterface interface { Get(ctx context.Context, key *meta.Key, options ...k8scloud.Option) (*compute.ForwardingRule, error) Insert(ctx context.Context, key *meta.Key, obj *compute.ForwardingRule, options ...k8scloud.Option) error Delete(ctx context.Context, key *meta.Key, options ...k8scloud.Option) error + SetLabels(ctx context.Context, key *meta.Key, obj *compute.GlobalSetLabelsRequest, options ...k8scloud.Option) error +} + +type regionalforwardingrulesInterface interface { + Get(ctx context.Context, key *meta.Key, options ...k8scloud.Option) (*compute.ForwardingRule, error) + Insert(ctx context.Context, key *meta.Key, obj *compute.ForwardingRule, options ...k8scloud.Option) error + Delete(ctx context.Context, key *meta.Key, options ...k8scloud.Option) error + SetLabels(ctx context.Context, key *meta.Key, obj *compute.RegionSetLabelsRequest, options ...k8scloud.Option) error } type healthchecksInterface interface { @@ -89,7 +97,7 @@ type Service struct { backendservices backendservicesInterface regionalbackendservices backendservicesInterface forwardingrules forwardingrulesInterface - regionalforwardingrules forwardingrulesInterface + regionalforwardingrules regionalforwardingrulesInterface healthchecks healthchecksInterface regionalhealthchecks healthchecksInterface instancegroups instancegroupsInterface From 6390869546e91ee2dc4b30b20ce657e1ad3e8738 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:27:25 +0000 Subject: [PATCH 22/28] Bump the all group with 2 updates Bumps the all group with 2 updates: [github.com/googleapis/gax-go/v2](https://github.com/googleapis/gax-go) and [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Updates `github.com/googleapis/gax-go/v2` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/googleapis/gax-go/releases) - [Commits](https://github.com/googleapis/gax-go/compare/v2.12.5...v2.13.0) Updates `google.golang.org/api` from 0.188.0 to 0.189.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.188.0...v0.189.0) --- updated-dependencies: - dependency-name: github.com/googleapis/gax-go/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 17120d662..53eb0de87 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 - github.com/googleapis/gax-go/v2 v2.12.5 + github.com/googleapis/gax-go/v2 v2.13.0 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/pkg/errors v0.9.1 @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.25.0 golang.org/x/mod v0.19.0 golang.org/x/net v0.27.0 - google.golang.org/api v0.188.0 + google.golang.org/api v0.189.0 google.golang.org/grpc v1.65.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -42,8 +42,8 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect cloud.google.com/go/longrunning v0.5.9 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect @@ -76,7 +76,7 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.4.0 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect github.com/BurntSushi/toml v1.0.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -156,9 +156,9 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 8cee8e88a..3ef8f664b 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= -cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= -cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= -cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= +cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/compute v1.27.3 h1:GFfoejA5qGeFYpKAfgoVzvgJ3D8upFKI/UR7MdiPdS0= cloud.google.com/go/compute v1.27.3/go.mod h1:5GuDo3l1k9CFhfIHK1sXqlqOW/iWX4/eBlO5FtxDhvQ= -cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c= -cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/container v1.37.3 h1:FCKTPz9OtId4LzB7dXzp+bDP4G0vlQOdUSYn2MddF38= cloud.google.com/go/container v1.37.3/go.mod h1:XKwtVfsTBsnZ9Ve1Pw2wkjk5kSjJqsHl3oBrbbi4w/M= cloud.google.com/go/iam v1.1.11 h1:0mQ8UKSfdHLut6pH9FM3bI55KWR46ketn0PuXleDyxw= @@ -180,8 +180,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA= -github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= +github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= +github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= @@ -456,19 +456,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= -google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= +google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From f97bc9a1dd9c655e662a528a51fa8dc22b3ec31c Mon Sep 17 00:00:00 2001 From: Francois Klieber Date: Thu, 25 Jul 2024 14:31:09 +0000 Subject: [PATCH 23/28] feat: improve compareMasterAuthorizedNetworksConfig --- cloud/services/container/clusters/reconcile.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go index dfb8cfca3..cb0074d98 100644 --- a/cloud/services/container/clusters/reconcile.go +++ b/cloud/services/container/clusters/reconcile.go @@ -27,6 +27,7 @@ import ( "cloud.google.com/go/container/apiv1/containerpb" "github.com/go-logr/logr" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/googleapis/gax-go/v2/apierror" "github.com/pkg/errors" "google.golang.org/grpc/codes" @@ -473,7 +474,7 @@ func compareMasterAuthorizedNetworksConfig(a, b *containerpb.MasterAuthorizedNet if (a.CidrBlocks == nil && b.CidrBlocks != nil && len(b.GetCidrBlocks()) == 0) || (b.CidrBlocks == nil && a.CidrBlocks != nil && len(a.GetCidrBlocks()) == 0) { return true } - if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks()) { + if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks(), cmpopts.IgnoreUnexported(containerpb.MasterAuthorizedNetworksConfig_CidrBlock{})) { return false } return true From 5d4d04879410ebb8de97cb1bbf07c512ef414bdc Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Tue, 2 Jul 2024 15:17:57 -0400 Subject: [PATCH 24/28] For internal Load Balancer use the same API port as external LB --- cloud/services/compute/loadbalancers/reconcile.go | 11 ++++++++--- .../compute/loadbalancers/reconcile_test.go | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/cloud/services/compute/loadbalancers/reconcile.go b/cloud/services/compute/loadbalancers/reconcile.go index 2e7acb349..9bd356d1f 100644 --- a/cloud/services/compute/loadbalancers/reconcile.go +++ b/cloud/services/compute/loadbalancers/reconcile.go @@ -601,9 +601,14 @@ func (s *Service) createOrGetRegionalForwardingRule(ctx context.Context, lbname spec.LoadBalancingScheme = string(loadBalanceTrafficInternal) spec.Region = s.scope.Region() spec.BackendService = backendSvc.SelfLink - // Ports are used instead or PortRange for passthrough Load Balancer - // Configure ports for k8s API and ignition - spec.Ports = []string{"6443", "22623"} + // Ports is used instead or PortRange for passthrough Load Balancer + // Configure ports for k8s API to match the external API which is the first port of range + var ports []string + portList := strings.Split(spec.PortRange, "-") + ports = append(ports, portList[0]) + // Also configure ignition port + ports = append(ports, "22623") + spec.Ports = ports spec.PortRange = "" subnet, err := s.getSubnet(ctx) if err != nil { diff --git a/cloud/services/compute/loadbalancers/reconcile_test.go b/cloud/services/compute/loadbalancers/reconcile_test.go index e24d3c545..746b7ebfd 100644 --- a/cloud/services/compute/loadbalancers/reconcile_test.go +++ b/cloud/services/compute/loadbalancers/reconcile_test.go @@ -117,6 +117,19 @@ func getBaseClusterScopeWithSharedVPC() (*scope.ClusterScope, error) { return clusterScope, nil } +func getBaseClusterScopeWithPortSet() (*scope.ClusterScope, error) { + clusterScope, err := getBaseClusterScope() + if err != nil { + return nil, err + } + + port := int32(6443) + clusterScope.Cluster.Spec.ClusterNetwork = &clusterv1.ClusterNetwork{ + APIServerPort: &port, + } + return clusterScope, nil +} + func TestService_createOrGetInstanceGroup(t *testing.T) { tests := []struct { name string @@ -811,7 +824,7 @@ func TestService_createOrGetRegionalForwardingRule(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { ctx := context.TODO() - clusterScope, err := getBaseClusterScope() + clusterScope, err := getBaseClusterScopeWithPortSet() if err != nil { t.Fatal(err) } From ab6784ab2b89f8310964a854dccb3853848ca18b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:07:13 +0000 Subject: [PATCH 25/28] Bump the all group with 7 updates Bumps the all group with 7 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.3` | `1.27.4` | | [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go) | `1.37.3` | `1.38.0` | | [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go) | `1.1.11` | `1.1.12` | | [cloud.google.com/go/resourcemanager](https://github.com/googleapis/google-cloud-go) | `1.9.10` | `1.9.11` | | [github.com/GoogleCloudPlatform/k8s-cloud-provider](https://github.com/GoogleCloudPlatform/k8s-cloud-provider) | `1.31.0` | `1.32.0` | | [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.19.0` | `2.19.1` | | [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.33.1` | `1.34.0` | Updates `cloud.google.com/go/compute` from 1.27.3 to 1.27.4 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/compute/v1.27.3...compute/v1.27.4) Updates `cloud.google.com/go/container` from 1.37.3 to 1.38.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/container/v1.37.3...pubsub/v1.38.0) Updates `cloud.google.com/go/iam` from 1.1.11 to 1.1.12 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.11...iam/v1.1.12) Updates `cloud.google.com/go/resourcemanager` from 1.9.10 to 1.9.11 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iap/v1.9.10...webrisk/v1.9.11) Updates `github.com/GoogleCloudPlatform/k8s-cloud-provider` from 1.31.0 to 1.32.0 - [Release notes](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/releases) - [Commits](https://github.com/GoogleCloudPlatform/k8s-cloud-provider/compare/v1.31.0...v1.32.0) Updates `github.com/onsi/ginkgo/v2` from 2.19.0 to 2.19.1 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.19.0...v2.19.1) Updates `github.com/onsi/gomega` from 1.33.1 to 1.34.0 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.33.1...v1.34.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/GoogleCloudPlatform/k8s-cloud-provider dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 53eb0de87..135a31547 100644 --- a/go.mod +++ b/go.mod @@ -11,16 +11,16 @@ replace ( ) require ( - cloud.google.com/go/compute v1.27.3 - cloud.google.com/go/container v1.37.3 - cloud.google.com/go/iam v1.1.11 - cloud.google.com/go/resourcemanager v1.9.10 - github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 + cloud.google.com/go/compute v1.27.4 + cloud.google.com/go/container v1.38.0 + cloud.google.com/go/iam v1.1.12 + cloud.google.com/go/resourcemanager v1.9.11 + github.com/GoogleCloudPlatform/k8s-cloud-provider v1.32.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.13.0 - github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 + github.com/onsi/ginkgo/v2 v2.19.1 + github.com/onsi/gomega v1.34.0 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 @@ -157,7 +157,7 @@ require ( golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 3ef8f664b..7a887e44a 100644 --- a/go.sum +++ b/go.sum @@ -5,25 +5,25 @@ cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= -cloud.google.com/go/compute v1.27.3 h1:GFfoejA5qGeFYpKAfgoVzvgJ3D8upFKI/UR7MdiPdS0= -cloud.google.com/go/compute v1.27.3/go.mod h1:5GuDo3l1k9CFhfIHK1sXqlqOW/iWX4/eBlO5FtxDhvQ= +cloud.google.com/go/compute v1.27.4 h1:XM8ulx6crjdl09XBfji7viFgZOEQuIxBwKmjRH9Rtmc= +cloud.google.com/go/compute v1.27.4/go.mod h1:7JZS+h21ERAGHOy5qb7+EPyXlQwzshzrx1x6L9JhTqU= cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= -cloud.google.com/go/container v1.37.3 h1:FCKTPz9OtId4LzB7dXzp+bDP4G0vlQOdUSYn2MddF38= -cloud.google.com/go/container v1.37.3/go.mod h1:XKwtVfsTBsnZ9Ve1Pw2wkjk5kSjJqsHl3oBrbbi4w/M= -cloud.google.com/go/iam v1.1.11 h1:0mQ8UKSfdHLut6pH9FM3bI55KWR46ketn0PuXleDyxw= -cloud.google.com/go/iam v1.1.11/go.mod h1:biXoiLWYIKntto2joP+62sd9uW5EpkZmKIvfNcTWlnQ= +cloud.google.com/go/container v1.38.0 h1:GP5zLamfvPZeOTifnGBSER/br76D5eJ97xhcXXrh5tM= +cloud.google.com/go/container v1.38.0/go.mod h1:U0uPBvkVWOJGY/0qTVuPS7NeafFEUsHSPqT5pB8+fCY= +cloud.google.com/go/iam v1.1.12 h1:JixGLimRrNGcxvJEQ8+clfLxPlbeZA6MuRJ+qJNQ5Xw= +cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg= cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k= cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= -cloud.google.com/go/resourcemanager v1.9.10 h1:++wnwx8jD5cCtUH/wQT5nAswv37M9rwyjwVOcIgJOIY= -cloud.google.com/go/resourcemanager v1.9.10/go.mod h1:UJ5zGD2ZD+Ng3MNxkU1fwBbpJQEQE1UctqpvV5pbP1M= +cloud.google.com/go/resourcemanager v1.9.11 h1:N8CmqszjKNOgJnrQVsg+g8VWIEGgcwsD5rPiay9cMC4= +cloud.google.com/go/resourcemanager v1.9.11/go.mod h1:SbNAbjVLoi2rt9G74bEYb3aw1iwvyWPOJMnij4SsmHA= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 h1:TW1ZnI8ORnfgWTmCBFoAjsO/9lTZkX2qdOgNwNEUsr8= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0/go.mod h1:YfY22pJ6JLsoo7QMouyfz+45Mb8RCwZdEIrie1teCpk= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.32.0 h1:mJj6GEg+6v18wbNRbuQompx7UXB9TMhreiYLKv8BADU= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.32.0/go.mod h1:o5jNXLZ3JSgVv+mR2PFp7syFS3DGi6DlzMDwi928YJA= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -243,10 +243,10 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= +github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= +github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= +github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= @@ -465,8 +465,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= -google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= -google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade h1:WxZOF2yayUHpHSbUE6NMzumUzBxYc3YGwo0YHnbzsJY= +google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From c5087b6e5c2895687218b1ee0b22d703942632eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 18:26:59 +0000 Subject: [PATCH 26/28] Bump golangci/golangci-lint-action from 6.0.1 to 6.1.0 in the all group Bumps the all group with 1 update: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action). Updates `golangci/golangci-lint-action` from 6.0.1 to 6.1.0 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/a4f60bb28d35aeee14e6880718e0c85ff1882e64...aaa42aa0628b4ae2578232a66b541047968fac86) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3a985f9b4..a9ff8e8aa 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,6 +21,6 @@ jobs: cache: false - name: golangci-lint - uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 + uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0 with: version: v1.58 From 25444984138b1d963872e6c5386f2c575fd964e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:26:47 +0000 Subject: [PATCH 27/28] Bump the all group with 3 updates Bumps the all group with 3 updates: [github.com/onsi/gomega](https://github.com/onsi/gomega), [golang.org/x/mod](https://github.com/golang/mod) and [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Updates `github.com/onsi/gomega` from 1.34.0 to 1.34.1 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.0...v1.34.1) Updates `golang.org/x/mod` from 0.19.0 to 0.20.0 - [Commits](https://github.com/golang/mod/compare/v0.19.0...v0.20.0) Updates `google.golang.org/api` from 0.189.0 to 0.190.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.189.0...v0.190.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 22 +++++++++++----------- go.sum | 44 ++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 135a31547..24aacb78d 100644 --- a/go.mod +++ b/go.mod @@ -20,14 +20,14 @@ require ( github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.13.0 github.com/onsi/ginkgo/v2 v2.19.1 - github.com/onsi/gomega v1.34.0 + github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 golang.org/x/crypto v0.25.0 - golang.org/x/mod v0.19.0 + golang.org/x/mod v0.20.0 golang.org/x/net v0.27.0 - google.golang.org/api v0.189.0 + google.golang.org/api v0.190.0 google.golang.org/grpc v1.65.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -42,9 +42,9 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth v0.7.3 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect - cloud.google.com/go/longrunning v0.5.9 // indirect + cloud.google.com/go/longrunning v0.5.11 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect @@ -70,7 +70,7 @@ require ( go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/sync v0.7.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect ) @@ -110,7 +110,7 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect - github.com/google/s2a-go v0.1.7 // indirect + github.com/google/s2a-go v0.1.8 // indirect github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect @@ -154,11 +154,11 @@ require ( golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + golang.org/x/tools v0.23.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect + google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 7a887e44a..cff3c14c5 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= -cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth v0.7.3 h1:98Vr+5jMaCZ5NZk6e/uBgf60phTk/XN84r8QEWB9yjY= +cloud.google.com/go/auth v0.7.3/go.mod h1:HJtWUx1P5eqjy/f6Iq5KeytNpbAcGolPhOgyop2LlzA= cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/compute v1.27.4 h1:XM8ulx6crjdl09XBfji7viFgZOEQuIxBwKmjRH9Rtmc= @@ -13,8 +13,8 @@ cloud.google.com/go/container v1.38.0 h1:GP5zLamfvPZeOTifnGBSER/br76D5eJ97xhcXXr cloud.google.com/go/container v1.38.0/go.mod h1:U0uPBvkVWOJGY/0qTVuPS7NeafFEUsHSPqT5pB8+fCY= cloud.google.com/go/iam v1.1.12 h1:JixGLimRrNGcxvJEQ8+clfLxPlbeZA6MuRJ+qJNQ5Xw= cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg= -cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k= -cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= +cloud.google.com/go/longrunning v0.5.11 h1:Havn1kGjz3whCfoD8dxMLP73Ph5w+ODyZB9RUsDxtGk= +cloud.google.com/go/longrunning v0.5.11/go.mod h1:rDn7//lmlfWV1Dx6IB4RatCPenTwwmqXuiP0/RgoEO4= cloud.google.com/go/resourcemanager v1.9.11 h1:N8CmqszjKNOgJnrQVsg+g8VWIEGgcwsD5rPiay9cMC4= cloud.google.com/go/resourcemanager v1.9.11/go.mod h1:SbNAbjVLoi2rt9G74bEYb3aw1iwvyWPOJMnij4SsmHA= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -170,8 +170,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= -github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI= github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -245,8 +245,8 @@ 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/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= -github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= -github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= @@ -375,16 +375,16 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -448,27 +448,27 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= -google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= +google.golang.org/api v0.190.0 h1:ASM+IhLY1zljNdLu19W1jTmU6A+gMk6M46Wlur61s+Q= +google.golang.org/api v0.190.0/go.mod h1:QIr6I9iedBLnfqoD6L6Vze1UvS5Hzj5r2aUBOaZnLHo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= -google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= -google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade h1:WxZOF2yayUHpHSbUE6NMzumUzBxYc3YGwo0YHnbzsJY= -google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf h1:OqdXDEakZCVtDiZTjcxfwbHPCT11ycCEsTKesBVKvyY= +google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:mCr1K1c8kX+1iSBREvU3Juo11CB+QOEWxbRS01wWl5M= +google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f h1:b1Ln/PG8orm0SsBbHZWke8dDp2lrCD4jSmfglFpTZbk= +google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From 06ec789314e3c10f5edb7c566a357779e1451e92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:38:25 +0000 Subject: [PATCH 28/28] Bump the all group with 8 updates Bumps the all group with 8 updates: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.4` | `1.27.5` | | [cloud.google.com/go/container](https://github.com/googleapis/google-cloud-go) | `1.38.0` | `1.38.1` | | [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go) | `1.1.12` | `1.1.13` | | [cloud.google.com/go/resourcemanager](https://github.com/googleapis/google-cloud-go) | `1.9.11` | `1.9.12` | | [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.19.1` | `2.20.0` | | [golang.org/x/crypto](https://github.com/golang/crypto) | `0.25.0` | `0.26.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.27.0` | `0.28.0` | | [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.190.0` | `0.191.0` | Updates `cloud.google.com/go/compute` from 1.27.4 to 1.27.5 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/compute/v1.27.4...compute/v1.27.5) Updates `cloud.google.com/go/container` from 1.38.0 to 1.38.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/pubsub/v1.38.0...container/v1.38.1) Updates `cloud.google.com/go/iam` from 1.1.12 to 1.1.13 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iam/v1.1.12...iam/v1.1.13) Updates `cloud.google.com/go/resourcemanager` from 1.9.11 to 1.9.12 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/iap/v1.9.11...webrisk/v1.9.12) Updates `github.com/onsi/ginkgo/v2` from 2.19.1 to 2.20.0 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.19.1...v2.20.0) Updates `golang.org/x/crypto` from 0.25.0 to 0.26.0 - [Commits](https://github.com/golang/crypto/compare/v0.25.0...v0.26.0) Updates `golang.org/x/net` from 0.27.0 to 0.28.0 - [Commits](https://github.com/golang/net/compare/v0.27.0...v0.28.0) Updates `google.golang.org/api` from 0.190.0 to 0.191.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.190.0...v0.191.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 34 ++++++++++++++--------------- go.sum | 68 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/go.mod b/go.mod index 24aacb78d..b1f5481a1 100644 --- a/go.mod +++ b/go.mod @@ -11,23 +11,23 @@ replace ( ) require ( - cloud.google.com/go/compute v1.27.4 - cloud.google.com/go/container v1.38.0 - cloud.google.com/go/iam v1.1.12 - cloud.google.com/go/resourcemanager v1.9.11 + cloud.google.com/go/compute v1.27.5 + cloud.google.com/go/container v1.38.1 + cloud.google.com/go/iam v1.1.13 + cloud.google.com/go/resourcemanager v1.9.12 github.com/GoogleCloudPlatform/k8s-cloud-provider v1.32.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/googleapis/gax-go/v2 v2.13.0 - github.com/onsi/ginkgo/v2 v2.19.1 + github.com/onsi/ginkgo/v2 v2.20.0 github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.26.0 golang.org/x/mod v0.20.0 - golang.org/x/net v0.27.0 - google.golang.org/api v0.190.0 + golang.org/x/net v0.28.0 + google.golang.org/api v0.191.0 google.golang.org/grpc v1.65.0 k8s.io/api v0.29.5 k8s.io/apimachinery v0.29.5 @@ -42,7 +42,7 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.3 // indirect + cloud.google.com/go/auth v0.8.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect cloud.google.com/go/longrunning v0.5.11 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect @@ -71,7 +71,7 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sync v0.7.0 // indirect + golang.org/x/sync v0.8.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect ) @@ -109,7 +109,7 @@ require ( github.com/google/cel-go v0.17.7 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect + github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect github.com/google/uuid v1.6.0 // indirect @@ -149,12 +149,12 @@ require ( go.opencensus.io v0.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect; indirect// indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/term v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.23.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.6.0 // indirect + golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect diff --git a/go.sum b/go.sum index cff3c14c5..d04ba72b2 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,22 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.7.3 h1:98Vr+5jMaCZ5NZk6e/uBgf60phTk/XN84r8QEWB9yjY= -cloud.google.com/go/auth v0.7.3/go.mod h1:HJtWUx1P5eqjy/f6Iq5KeytNpbAcGolPhOgyop2LlzA= +cloud.google.com/go/auth v0.8.0 h1:y8jUJLl/Fg+qNBWxP/Hox2ezJvjkrPb952PC1p0G6A4= +cloud.google.com/go/auth v0.8.0/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= -cloud.google.com/go/compute v1.27.4 h1:XM8ulx6crjdl09XBfji7viFgZOEQuIxBwKmjRH9Rtmc= -cloud.google.com/go/compute v1.27.4/go.mod h1:7JZS+h21ERAGHOy5qb7+EPyXlQwzshzrx1x6L9JhTqU= +cloud.google.com/go/compute v1.27.5 h1:iii9Z+FhEeZ5cUkGOEqU+GM7MJSyxMgbE7H7j+JndYY= +cloud.google.com/go/compute v1.27.5/go.mod h1:DfwDGujFTdSeiE8b8ZqadF/uxHFBz+ekGsk8Zfi9dTA= cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= -cloud.google.com/go/container v1.38.0 h1:GP5zLamfvPZeOTifnGBSER/br76D5eJ97xhcXXrh5tM= -cloud.google.com/go/container v1.38.0/go.mod h1:U0uPBvkVWOJGY/0qTVuPS7NeafFEUsHSPqT5pB8+fCY= -cloud.google.com/go/iam v1.1.12 h1:JixGLimRrNGcxvJEQ8+clfLxPlbeZA6MuRJ+qJNQ5Xw= -cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg= +cloud.google.com/go/container v1.38.1 h1:Pb0GbZIg/KS4A9gbF3J4JHmrgPpBA2y+4v9N04aJkOs= +cloud.google.com/go/container v1.38.1/go.mod h1:2r4Qiz6IG2LhRFfWhPNmrYD7yzdE2B2kghigVWoSw/g= +cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= +cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= cloud.google.com/go/longrunning v0.5.11 h1:Havn1kGjz3whCfoD8dxMLP73Ph5w+ODyZB9RUsDxtGk= cloud.google.com/go/longrunning v0.5.11/go.mod h1:rDn7//lmlfWV1Dx6IB4RatCPenTwwmqXuiP0/RgoEO4= -cloud.google.com/go/resourcemanager v1.9.11 h1:N8CmqszjKNOgJnrQVsg+g8VWIEGgcwsD5rPiay9cMC4= -cloud.google.com/go/resourcemanager v1.9.11/go.mod h1:SbNAbjVLoi2rt9G74bEYb3aw1iwvyWPOJMnij4SsmHA= +cloud.google.com/go/resourcemanager v1.9.12 h1:p++iHmmeq9iWTia8WhNmPvBhL7MZsglQpZAYlHCguBs= +cloud.google.com/go/resourcemanager v1.9.12/go.mod h1:unouv9x3+I+6kVeE10LGM3oJ8aQrUZganWnRchitbAM= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -168,8 +168,8 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -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/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI= @@ -243,8 +243,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= -github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= +github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= +github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -372,8 +372,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= @@ -397,19 +397,19 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -424,21 +424,21 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -448,16 +448,16 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.190.0 h1:ASM+IhLY1zljNdLu19W1jTmU6A+gMk6M46Wlur61s+Q= -google.golang.org/api v0.190.0/go.mod h1:QIr6I9iedBLnfqoD6L6Vze1UvS5Hzj5r2aUBOaZnLHo= +google.golang.org/api v0.191.0 h1:cJcF09Z+4HAB2t5qTQM1ZtfL/PemsLFkcFG67qq2afk= +google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=