Automated repo sync 20240518

Update community (release-1.30) (patch) (#4365)
Update addon-vpcctl release to v0.27.2 and addon-classic release to v0.2.2 (release-1.30) (#4366)

.gitignore

@@ -2,3 +2,4 @@
 .vagrant
 cover.out
 cover.html
+ibm-cloud-controller-manager

Makefile

@@ -45,7 +45,7 @@ YAML_FILES=$(shell find . -type f -name '*.y*ml' -not -path "./build-tools/*" -n
 INI_FILES=$(shell find . -type f -name '*.ini' -not -path "./build-tools/*")
 OSS_FILES := go.mod
 
-GOLANGCI_LINT_VERSION := 1.56.2
+GOLANGCI_LINT_VERSION := 1.58.1
 GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)
 
 HUB_RLS ?= 2.14.2

addons/classic.yml

@@ -21,7 +21,7 @@
 source: github.ibm.com/alchemy-containers/armada-classic-lb
 
 # (Required) - git release or branch name in the source github repo
-release: v0.2.1
+release: v0.2.2
 
 # (Required) - source directory in the github repo containing GO files
 source_dir: pkg/classic
@@ -47,8 +47,8 @@ update_go_mod: true
 go_get_updates: auto-detect
 
 # (Optional) - additional go.mod replace directives which are needed when including this module version
-go_mod_replace_1:
-go_mod_replace_2:
+go_mod_replace_1: github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
+go_mod_replace_2: github.com/prometheus/common => github.com/prometheus/common v0.47.0
 go_mod_replace_3:
 
 # (Required) - set to "false" to NOT create a PR for the GO files that were copied

addons/vpcctl.yml

@@ -21,7 +21,7 @@
 source: github.ibm.com/alchemy-containers/armada-vpc-lb
 
 # (Required) - git release or branch name in the source github repo
-release: v0.27.1
+release: v0.27.2
 
 # (Required) - source directory in the github repo containing GO files
 source_dir: pkg/vpcctl
@@ -47,8 +47,8 @@ update_go_mod: true
 go_get_updates: auto-detect
 
 # (Optional) - additional go.mod replace directives which are needed when including this module version
-go_mod_replace_1:
-go_mod_replace_2:
+go_mod_replace_1: github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
+go_mod_replace_2: github.com/prometheus/common => github.com/prometheus/common v0.47.0
 go_mod_replace_3:
 
 # (Required) - set to "false" to NOT create a PR for the GO files that were copied

go.mod

@@ -3,7 +3,7 @@ module cloud.ibm.com/cloud-provider-ibm
 go 1.22.2
 
 require (
-	github.com/IBM/go-sdk-core/v5 v5.17.2
+	github.com/IBM/go-sdk-core/v5 v5.17.3
 	github.com/IBM/platform-services-go-sdk v0.62.11
 	github.com/IBM/vpc-go-sdk v0.51.0
 	github.com/fsnotify/fsnotify v1.7.0

go.sum

@@ -5,8 +5,8 @@ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGB
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 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/IBM/go-sdk-core/v5 v5.17.2 h1:MyFCUPYqcNUQIx9d9srq9znMEZcvu6X3DOGIPjegP8o=
-github.com/IBM/go-sdk-core/v5 v5.17.2/go.mod h1:GatGZpxlo1KaxiRN6E10/rNgWtUtx1hN/GoHSCaSPKA=
+github.com/IBM/go-sdk-core/v5 v5.17.3 h1:CZSVCKzhQc/hRQZOtuEmi9dlNtWMnxJvOsPtQKP7cZ4=
+github.com/IBM/go-sdk-core/v5 v5.17.3/go.mod h1:GatGZpxlo1KaxiRN6E10/rNgWtUtx1hN/GoHSCaSPKA=
 github.com/IBM/platform-services-go-sdk v0.62.11 h1:EGsiY90bM9M9sSdBVgpsX4QK1z99JZzedVDlrY2gzmc=
 github.com/IBM/platform-services-go-sdk v0.62.11/go.mod h1:M26dloj9C48k9AjfMcKGsgH/acEjaUvxjVS8z41Q8dg=
 github.com/IBM/vpc-go-sdk v0.51.0 h1:JfeE/TnPm/NFU59UctiPzjxEhHtmBqXxG6zHH5eTI8I=

ibm/ibm.go

@@ -109,7 +109,7 @@ type Provider struct {
 	IamEndpointOverride string `gcfg:"iamEndpointOverride"`
 	// Optional: Resource Manager endpoint override URL
 	RmEndpointOverride string `gcfg:"rmEndpointOverride"`
-	// Optional: Armada API Endpoint URL
+	// Optional: IBM Cloud Kubernetes Service API Private Endpoint Hostname
 	IKSPrivateEndpointHostname string `gcfg:"iksPrivateEndpointHostname"`
 	// File containing cloud credentials both for Classic and VPC
 	CloudCredentials string `gcfg:"cloudCredentials"`
@@ -299,6 +299,7 @@ func NewCloud(config io.Reader) (cloudprovider.Interface, error) {
 			APIKeySecretPath:           c.Config.Prov.CloudCredentials,
 			Application:                c.Config.LBDeployment.Application,
 			CalicoDatastore:            c.Config.Kubernetes.CalicoDatastore,
+			ClusterID:                  c.Config.Prov.ClusterID,
 			ConfigFilePath:             c.Config.Kubernetes.ConfigFilePaths[0],
 			Region:                     c.Config.Prov.Region,
 			IKSPrivateEndpointHostname: c.Config.Prov.IKSPrivateEndpointHostname,

pkg/classic/classic-config.go

@@ -31,6 +31,7 @@ type CloudConfig struct {
 	Application                string // Name of the application to use as a label for the load balancer deployment
 	CalicoDatastore            string // The Calico datastore type: "ETCD" or "KDD"
 	ConfigFilePath             string // The Kubernetes config file path
+	ClusterID                  string // ClusterID
 	Region                     string // Region
 	IKSPrivateEndpointHostname string // IKS Endpoint
 	Image                      string // Name of the image to use for the load balancer deployment

scripts/updatePackage.sh

@@ -126,7 +126,7 @@ if [ "${UPDATE_GO_MOD}" == "true" ]; then
         echo "replace ${GO_MOD_REPLACE_1}" >> go.mod
     fi
     if [ -n "${GO_MOD_REPLACE_2}" ]; then
-        echo "replace ${GO_MOD_REPLACE_1}" >> go.mod
+        echo "replace ${GO_MOD_REPLACE_2}" >> go.mod
     fi
     if [ -n "${GO_MOD_REPLACE_3}" ]; then
         echo "replace ${GO_MOD_REPLACE_3}" >> go.mod