Merge pull request #29 from openshift-cloud-team/rebase-bot-master

Bug 2034881: Merge https://github.com/IBM-Cloud/cloud-provider-ibm:release-1.23 into master

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
   # You are encouraged to use static refs such as tags, instead of branch name
   #
   # Running "pre-commit autoupdate" would automatically updates rev to latest tag
-  rev: 0.13.1+ibm.38.dss
+  rev: 0.13.1+ibm.46.dss
   hooks:
   - id: detect-secrets # pragma: whitelist secret
     # Add options for detect-secrets-hook binary. You can run `detect-secrets-hook --help` to list out all possible options.

.secrets.baseline

@@ -3,14 +3,17 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2021-06-24T17:28:14Z",
+  "generated_at": "2021-11-22T17:34:17Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
     },
     {
       "name": "ArtifactoryDetector"
     },
+    {
+      "name": "AzureStorageKeyDetector"
+    },
     {
       "base64_limit": 4.5,
       "name": "Base64HighEntropyString"
@@ -28,6 +31,9 @@
       "ghe_instance": "github.ibm.com",
       "name": "GheDetector"
     },
+    {
+      "name": "GitHubTokenDetector"
+    },
     {
       "hex_limit": 3,
       "name": "HexHighEntropyString"
@@ -48,6 +54,9 @@
     {
       "name": "MailchimpDetector"
     },
+    {
+      "name": "NpmDetector"
+    },
     {
       "name": "PrivateKeyDetector"
     },
@@ -57,6 +66,9 @@
     {
       "name": "SoftlayerDetector"
     },
+    {
+      "name": "SquareOAuthDetector"
+    },
     {
       "name": "StripeDetector"
     },
@@ -67,7 +79,7 @@
   "results": {
     "addons/calicoctl.yml": [
       {
-        "hashed_secret": "029ca3fcc6d777d5529be8318f4334f164833599",
+        "hashed_secret": "8749bc355bd9eb8b177f44f42edc3252de0bf56e",
         "is_secret": false,
         "is_verified": false,
         "line_number": 21,
@@ -77,7 +89,7 @@
     ],
     "addons/vpcctl.yml": [
       {
-        "hashed_secret": "75ce1416342ff111e02b7c6896c2646989444527",
+        "hashed_secret": "ab59b350d1a2492403076363c08d0058afab60bd",
         "is_secret": false,
         "is_verified": false,
         "line_number": 20,
@@ -90,7 +102,7 @@
         "hashed_secret": "2978f389a32111504f1c3b39df2123be5c453020",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 340,
+        "line_number": 357,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -110,7 +122,7 @@
         "hashed_secret": "b1775a785f09a6ebaf2dc33d6eaeb98974d9cdb8",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 131,
+        "line_number": 135,
         "type": "Hex High Entropy String",
         "verified_result": null
       }
@@ -125,7 +137,7 @@
         "verified_result": null
       }
     ],
-    "travis-secret-metadata/ALL_GLOBAL_UPDATE_IKS_PIPELINE_IAM_APIKEY_20201116.yaml": [
+    "travis-secret-metadata/ALL_GLOBAL_UPDATE_IKS_PIPELINE_IAM_APIKEY_20211116.yaml": [
       {
         "hashed_secret": "3eb416223e9e69e6bb8ee19793911ad1ad2027d8",
         "is_secret": false,
@@ -146,7 +158,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.38.dss",
+  "version": "0.13.1+ibm.46.dss",
   "word_list": {
     "file": null,
     "hash": null

.travis.yml

@@ -19,13 +19,13 @@
 language: go
 
 go:
-  - 1.17.2
+  - 1.17.5
 
 dist: bionic
 
 env:
   global:
-    - IKS_PIPELINE_IAM_APIKEY="${ALL_GLOBAL_UPDATE_IKS_PIPELINE_IAM_APIKEY_20201116}"
+    - IKS_PIPELINE_IAM_APIKEY="${ALL_GLOBAL_UPDATE_IKS_PIPELINE_IAM_APIKEY_20211116}"
     - registry_iam_api_key="${PROD_GLOBAL_UPDATE_ARMADA_UPDATE_BUILD_REGISTRY_API_KEY_20210423}"
     - GHE_TOKEN="${ALL_GLOBAL_UPDATE_IKSROCH1_GHE_TOKEN_20210520}"
     - TRAVIS_HOSTNAME="travis.ibm.com"
@@ -86,12 +86,12 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      condition: ${TRAVIS_TAG} == v1.23.0-alpha.4-* && ${BUILD_JOB_NAME} == Default
-      go: 1.17.2
+      condition: ${TRAVIS_TAG} == v1.23.1-* && ${BUILD_JOB_NAME} == Default
+      go: 1.17.5
   - provider: script
     script: BUILD_TAG=${TRAVIS_TAG} make dev-deploy
     skip_cleanup: true
     on:
       tags: true
-      go: 1.17.2
+      go: 1.17.5
       condition: ${TRAVIS_TAG} == dev-* && ${BUILD_JOB_NAME} == Default

Makefile

@@ -49,7 +49,7 @@ GOLANGCI_LINT_VERSION := 1.42.1
 GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)
 
 REGISTRY ?= armada-master
-TAG ?= v1.23.0-alpha.4
+TAG ?= v1.23.1
 VPCCTL_SOURCE=$(shell cat addons/vpcctl.yml | awk '/^source:/{print $$2}')
 VPCCTL_CHECKSUM=$(shell cat addons/vpcctl.yml | awk '/^checksum:/{print $$2}')
 
@@ -124,7 +124,8 @@ endif
 lint:
 ifdef GOLANGCI_LINT_EXISTS
 	# NOTE(cjschaef): golangci-lint can take a while to run, bump deadline
-	golangci-lint run --deadline 5m -e G404 -e exitAfterDefer
+	echo "Running gosec"
+	golangci-lint run --deadline 5m -e exitAfterDefer
 else
 	@echo "golangci-lint is not installed"
 	exit 1

README.md

@@ -6,7 +6,7 @@ infrastructure node and load balancer support to
 [Kubernetes](https://kubernetes.io/docs/home/) or
 [OpenShift](https://docs.openshift.com/) clusters running on
 [IBM Cloud](https://cloud.ibm.com/docs). This repository branch is based on
-[Kubernetes version v1.23.0-alpha.4](https://github.com/kubernetes/kubernetes/tree/v1.23.0-alpha.4).
+[Kubernetes version v1.23.1](https://github.com/kubernetes/kubernetes/tree/v1.23.1).
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines.
 
 ## Local Build and Deploy Instructions
@@ -123,7 +123,7 @@ for a new Kubernetes version.
      to trigger. Running the following steps will create the PR:
 
      1. `cd vagrant-kube-build`
-     1. `./build.sh make kube-update KUBE_VERSION=vX.Y.Z` (e.g `v1.23.0-alpha.4`)
+     1. `./build.sh make kube-update KUBE_VERSION=vX.Y.Z` (e.g `v1.23.1`)
      1. Go to the URL displayed in the build output to create the pull request.
 
 1. go.mod and go.sum dependencies are kept up to date with the

docs/examples/ibm-cloud-controller-manager.yaml

@@ -70,7 +70,7 @@ spec:
       terminationGracePeriodSeconds: 90
       containers:
         - name: ibm-cloud-controller-manager
-          image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.23.0-alpha.4-1
+          image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.23.1-1
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsNonRoot: true

go.mod

@@ -3,17 +3,17 @@ module cloud.ibm.com/cloud-provider-ibm
 go 1.17
 
 require (
-	github.com/IBM/go-sdk-core/v5 v5.8.0
-	github.com/IBM/vpc-go-sdk v0.13.0
+	github.com/IBM/go-sdk-core/v5 v5.9.1
+	github.com/IBM/vpc-go-sdk v0.14.0
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	gopkg.in/gcfg.v1 v1.2.3
-	k8s.io/api v0.23.0-alpha.4
-	k8s.io/apimachinery v0.23.0-alpha.4
-	k8s.io/client-go v0.23.0-alpha.4
-	k8s.io/cloud-provider v0.23.0-alpha.4
-	k8s.io/component-base v0.23.0-alpha.4
+	k8s.io/api v0.23.1
+	k8s.io/apimachinery v0.23.1
+	k8s.io/client-go v0.23.1
+	k8s.io/cloud-provider v0.23.1
+	k8s.io/component-base v0.23.1
 	k8s.io/klog/v2 v2.30.0
 )
 
@@ -37,7 +37,7 @@ require (
 	github.com/go-openapi/errors v0.19.8 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/strfmt v0.20.2 // indirect
+	github.com/go-openapi/strfmt v0.21.1 // indirect
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/locales v0.13.0 // indirect
 	github.com/go-playground/universal-translator v0.17.0 // indirect
@@ -75,7 +75,7 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.0 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.0 // indirect
-	go.mongodb.org/mongo-driver v1.5.1 // indirect
+	go.mongodb.org/mongo-driver v1.7.5 // indirect
 	go.opentelemetry.io/contrib v0.20.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -91,30 +91,31 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
+	golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
-	google.golang.org/grpc v1.38.0 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
+	google.golang.org/grpc v1.40.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apiserver v0.23.0-alpha.4 // indirect
-	k8s.io/controller-manager v0.23.0-alpha.4 // indirect
-	k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 // indirect
+	k8s.io/apiserver v0.23.1 // indirect
+	k8s.io/component-helpers v0.23.1 // indirect
+	k8s.io/controller-manager v0.23.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.23 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )