Skip to content

Commit 2e732f8

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #136 from openshift-cloud-team/rebase-bot-master
CNTRLPLANE-106: Merge https://github.com/kubernetes-sigs/cloud-provider-azure:master (78638bd) into main
2 parents 7f0ee8b + 0ce0332 commit 2e732f8

File tree

686 files changed

+72920
-3926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

686 files changed

+72920
-3926
lines changed

‎.github/workflows/scorecards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7
75+
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
7676
with:
7777
sarif_file: results.sarif

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# syntax=docker/dockerfile:1
1616

17-
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-bullseye@sha256:94a7ec6c0a7952c37cf1bf87d02e712d881b8c4749528c4602b0e564c2957bda AS builder
17+
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23.6-bookworm@sha256:02a6172539bd60b8a1f555301a21a2e248b3d957c9a46bbe18509edf2db47d13 AS builder
1818

1919
ARG ENABLE_GIT_COMMAND=true
2020
ARG ARCH=amd64

‎LICENSES/vendor/github.com/samber/lo/LICENSE

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloud-node-manager.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23@sha256:7fe38e3d30b825c6a841a47eaa853dc2ad8186a46f0d59ed58da500f32536085 AS builder
17+
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23.6-bookworm@sha256:02a6172539bd60b8a1f555301a21a2e248b3d957c9a46bbe18509edf2db47d13 AS builder
1818

1919
ARG ENABLE_GIT_COMMAND=true
2020
ARG ARCH=amd64

‎cloudbuild.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ timeout: 9000s
77
options:
88
substitution_option: ALLOW_LOOSE
99
steps:
10-
- name: "gcr.io/k8s-testimages/gcb-docker-gcloud:v20240523-a15ad90fc9"
10+
# gcb-docker-gcloud is published at https://testgrid.k8s.io/sig-testing-image-pushes#gcb-docker-gcloud
11+
- name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140" # v20250116-2a05ea7e3d
1112
entrypoint: make
1213
env:
1314
- TAG=${_GIT_TAG}

‎e2e.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23-bullseye@sha256:94a7ec6c0a7952c37cf1bf87d02e712d881b8c4749528c4602b0e564c2957bda
17+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.6-bookworm@sha256:02a6172539bd60b8a1f555301a21a2e248b3d957c9a46bbe18509edf2db47d13
1818

1919
WORKDIR /go/src/sigs.k8s.io/cloud-provider-azure
2020

‎go.mod

+31-30
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ godebug winsymlink=0
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
9-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
9+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
1010
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.2
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.3.0
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.2.0
1313
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0
1414
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0
15-
github.com/evanphx/json-patch v5.9.0+incompatible
15+
github.com/evanphx/json-patch v5.9.11+incompatible
1616
github.com/fsnotify/fsnotify v1.8.0
1717
github.com/go-logr/logr v1.4.2
1818
github.com/google/uuid v1.6.0
1919
github.com/prometheus/client_golang v1.20.5
20-
github.com/samber/lo v1.48.0
21-
github.com/spf13/cobra v1.8.1
22-
github.com/spf13/pflag v1.0.5
20+
github.com/samber/lo v1.49.1
21+
github.com/spf13/cobra v1.9.1
22+
github.com/spf13/pflag v1.0.6
2323
github.com/stretchr/testify v1.10.0
2424
go.opentelemetry.io/otel v1.34.0
2525
go.opentelemetry.io/otel/exporters/prometheus v0.56.0
@@ -28,23 +28,23 @@ require (
2828
go.opentelemetry.io/otel/sdk/metric v1.34.0
2929
go.opentelemetry.io/otel/trace v1.34.0
3030
go.uber.org/mock v0.5.0
31-
golang.org/x/sync v0.10.0
32-
golang.org/x/sys v0.29.0
33-
golang.org/x/text v0.21.0
34-
k8s.io/api v0.32.1
35-
k8s.io/apimachinery v0.32.1
36-
k8s.io/apiserver v0.32.1
37-
k8s.io/client-go v0.32.1
38-
k8s.io/cloud-provider v0.32.1
39-
k8s.io/component-base v0.32.1
40-
k8s.io/component-helpers v0.32.1
41-
k8s.io/controller-manager v0.32.1
31+
golang.org/x/sync v0.11.0
32+
golang.org/x/sys v0.30.0
33+
golang.org/x/text v0.22.0
34+
k8s.io/api v0.32.2
35+
k8s.io/apimachinery v0.32.2
36+
k8s.io/apiserver v0.32.2
37+
k8s.io/client-go v0.32.2
38+
k8s.io/cloud-provider v0.32.2
39+
k8s.io/component-base v0.32.2
40+
k8s.io/component-helpers v0.32.2
41+
k8s.io/controller-manager v0.32.2
4242
k8s.io/klog/v2 v2.130.1
43-
k8s.io/kubelet v0.32.1
44-
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
45-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.4.14
46-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.3.2
47-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.3.4
43+
k8s.io/kubelet v0.32.2
44+
k8s.io/utils v0.0.0-20241210054802-24370beab758
45+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.0
46+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.0
47+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.0
4848
sigs.k8s.io/yaml v1.4.0
4949
)
5050

@@ -57,12 +57,13 @@ require (
5757
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
5858
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0 // indirect
5959
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect
60-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0 // indirect
61-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
60+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1 // indirect
61+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
6262
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
63-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
63+
github.com/Azure/msi-dataplane v0.4.0 // indirect
64+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
6465
github.com/NYTimes/gziphandler v1.1.1 // indirect
65-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
66+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
6667
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6768
github.com/beorn7/perks v1.0.1 // indirect
6869
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -118,12 +119,12 @@ require (
118119
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
119120
go.uber.org/multierr v1.11.0 // indirect
120121
go.uber.org/zap v1.27.0 // indirect
121-
golang.org/x/crypto v0.32.0 // indirect
122+
golang.org/x/crypto v0.33.0 // indirect
122123
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
123-
golang.org/x/net v0.34.0 // indirect
124+
golang.org/x/net v0.35.0 // indirect
124125
golang.org/x/oauth2 v0.24.0 // indirect
125-
golang.org/x/term v0.28.0 // indirect
126-
golang.org/x/time v0.9.0 // indirect
126+
golang.org/x/term v0.29.0 // indirect
127+
golang.org/x/time v0.10.0 // indirect
127128
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
128129
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
129130
google.golang.org/grpc v1.65.0 // indirect
@@ -132,7 +133,7 @@ require (
132133
gopkg.in/inf.v0 v0.9.1 // indirect
133134
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
134135
gopkg.in/yaml.v3 v3.0.1 // indirect
135-
k8s.io/kms v0.32.1 // indirect
136+
k8s.io/kms v0.32.2 // indirect
136137
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
137138
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
138139
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect

0 commit comments

Comments
 (0)