OCPCLOUD-3276,OCPBUGS-76344,OCPBUGS-69888,OCPBUGS-78289: Merge https://github.com/kubernetes/cloud-provider-aws:master (ea961d6) into main #131

coderabbitai · 2026-03-16T11:11:24Z

⚠️ Potential issue | 🟠 Major

Run the final image as a non-root user.

The runtime stage has no USER, so it defaults to root. That weakens container hardening.

Proposed minimal fix

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 LABEL description="AWS Cloud Controller Manager" COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager +USER 65532 ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ]

As per coding guidelines, "Focus on major issues impacting performance, readability, maintainability and security."

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9

LABEL description="AWS Cloud Controller Manager"

COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager

COPY --from=builder /build/aws-cloud-controller-manager-tests-ext.gz /bin/aws-cloud-controller-manager-tests-ext.gz

ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ]

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9

LABEL description="AWS Cloud Controller Manager"

COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager

USER 65532

ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ]

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed. In `@Dockerfile.openshift` around lines 10 - 16, Add a non-root user and switch the runtime stage to that user: create or use a low-privilege user (e.g., "awsccm") in the final image, ensure the binary copied by COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager is owned and executable by that user, and add a USER awsccm line before the ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ] so the container does not run as root; also ensure any directories the process needs are writable by that user.

coderabbitai · 2026-03-11T11:33:40Z

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🌐 Web query:

What is the latest stable Go version released?

💡 Result:

The latest stable Go release is Go 1.26.1, released on March 5, 2026. [1]

Sources:
[1] https://go.dev/doc/devel/release

🌐 Web query:

Go 1.25.0 release date and stability

💡 Result:

Release date: Go 1.25.0 was released on August 12, 2025. [1]

Stability: 1.25.0 is a stable, production major release (not a beta/RC). Some new capabilities in the 1.25 line are explicitly opt-in experimental features (for example, experimental GC and encoding/json/v2), so you only use them if you enable them. [2]

Practical recommendation: For the best “stability” in real deployments, use the latest Go 1.25 patch release (it includes accumulated bug/security fixes). As of March 5, 2026, that is Go 1.25.8. [1]

Sources:
[1] Go “Release History” (go1.25.0 / 1.25.x dates) — https://tip.golang.org/doc/devel/release
[2] Go 1.25 Release Notes / announcement (experimental features are opt-in; compatibility promise) — https://tip.golang.org/doc/go1.25 , https://go.dev/blog/go1.25

Consider updating to Go 1.25.8 instead of 1.25.0.

Go 1.25.0 is a valid, production-stable release. However, as of March 2026, Go 1.25.8 is available and includes accumulated bug and security fixes. Use the latest 1.25 patch release for production deployments.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed. In `@go.mod` at line 3, Update the Go version declaration in go.mod from "go 1.25.0" to "go 1.25.8": open the go.mod file and change the module's go directive to "go 1.25.8" so the project uses the latest 1.25 patch release; run go mod tidy or a quick build to verify there are no compatibility issues after the change.

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
     build_root_image:
       name: release
       namespace: openshift
-      tag: rhel-9-release-golang-1.24-openshift-4.22
+      tag: rhel-9-release-golang-1.25-openshift-4.22

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,3 @@ e2e.test @@
     .idea/
     **/*.swp
     .DS_Store
-    # OpenShift hack
-    /aws-cloud-controller-manager-tests-ext

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
		defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookworm.0

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,15 +14,15 @@ @@
     ##                               BUILD ARGS                                   ##
     ################################################################################
     # This build arg allows the specification of a custom Golang image.
-    ARG GOLANG_IMAGE=golang:1.24.9
+    ARG GOLANG_IMAGE=golang:1.25.5
     # The distroless image on which the CPI manager image is built.
     #
     # Please do not use "latest". Explicit tags should be used to provide
     # deterministic builds. Follow what kubernetes uses to build
     # kube-controller-manager, for example for 1.23.x:
     # https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
-    ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
+    ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookworm.0
     ################################################################################
     ##                              BUILD STAGE                                   ##
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ OUTPUT ?= $(shell pwd)/_output @@
     INSTALL_PATH ?= $(OUTPUT)/bin
     LDFLAGS ?= -w -s -X k8s.io/component-base/version.gitVersion=$(VERSION) -X main.gitVersion=$(VERSION)
-    GOLANG_DIRECTIVE_VERSION ?= 1.24.0
+    GOLANG_DIRECTIVE_VERSION ?= 1.25.0
     CURL_RETRIES ?= 3
     # flags for ecr-credential-provider artifact promotion
@@ Expand Down Expand Up @@
     	BUILD_IMAGE=$(IMAGE) \
     	BUILD_VERSION=$(VERSION) \
     	INSTALL_PATH=$(INSTALL_PATH) \
+    	KOPS_DISCOVERY_STORE=s3://cloud-provider-aws-shared-e2e \
     	GINKGO_FOCUS="\[cloud-provider-aws-e2e\]" \
     	./hack/e2e/run.sh
@@ Expand All / @@ -197,6 +198,7 @@ test-e2e: e2e.test docker-build-amd64 install-e2e-tools @@
     	BUILD_IMAGE=$(IMAGE) \
     	BUILD_VERSION=$(VERSION) \
     	INSTALL_PATH=$(INSTALL_PATH) \
+    	KOPS_DISCOVERY_STORE=s3://cloud-provider-aws-shared-e2e \
     	GINKGO_FOCUS="\[cloud-provider-aws-e2e\]" \
     	./hack/e2e/run.sh
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPCLOUD-3276,OCPBUGS-76344,OCPBUGS-69888,OCPBUGS-78289: Merge https://github.com/kubernetes/cloud-provider-aws:master (ea961d6) into main #131

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

coderabbitai bot Mar 16, 2026

Uh oh!

coderabbitai bot Mar 11, 2026

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ steps: @@
           - --platform=linux/amd64,linux/arm64
           - .
       # Build cloudbuild artifacts (for attestation)
-      - name: 'docker.io/library/golang:1.24.9-bookworm'
+      - name: 'docker.io/library/golang:1.25.5-bookworm'
         id: cloudbuild-artifacts
         entrypoint: make
         env:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ import ( @@
     	"net/url"
     	"os"
     	"regexp"
+    	"slices"
     	"strings"
     	"time"
@@ Expand All / @@ -41,7 +42,8 @@ import ( @@
     )
     const ecrPublicRegion string = "us-east-1"
-    const ecrPublicHost string = "public.ecr.aws"
+    var ecrPublicHosts []string = []string{"public.ecr.aws", "ecr-public.aws.com"}
     var ecrPrivateHostPattern = regexp.MustCompile(`^(\d{12})\.dkr[\.\-]ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.(amazonaws\.(?:com(?:\.cn)?|eu)|on\.(?:aws|amazonwebservices\.com\.cn)|sc2s\.sgov\.gov|c2s\.ic\.gov|cloud\.adc-e\.uk|csp\.hci\.ic\.gov)$`)
@@ Expand Down Expand Up @@
     	if e.sts == nil {
     		region := ""
-    		if imageHost != ecrPublicHost {
+    		if !slices.Contains(ecrPublicHosts, imageHost) {
     			region = parseRegionFromECRPrivateHost(imageHost)
     		}
     		sts, err := stsProvider(ctx, region)
@@ Expand Down Expand Up @@
     	}
     	credentialsProvider := e.buildCredentialsProvider(ctx, request, imageHost)
-    	if imageHost == ecrPublicHost {
+    	if slices.Contains(ecrPublicHosts, imageHost) {
     		var optFns = []func(*ecrpublic.Options){}
     		if credentialsProvider != nil {
     			optFns = append(optFns, func(o *ecrpublic.Options) {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -341,6 +341,12 @@ func Test_GetCredentials_Public(t *testing.T) { @@
     			getAuthorizationTokenOutput: generatePublicGetAuthorizationTokenOutput("user", "pass", nil),
     			response:                    generateResponse("public.ecr.aws", "user", "pass"),
     		},
+    		{
+    			name:                        "dualstack success",
+    			image:                       "ecr-public.aws.com",
+    			getAuthorizationTokenOutput: generatePublicGetAuthorizationTokenOutput("user", "pass", nil),
+    			response:                    generateResponse("ecr-public.aws.com", "user", "pass"),
+    		},
     		{
     			name:                        "empty image",
     			image:                       "",
@@ Expand Down Expand Up / @@ -387,6 +393,17 @@ func Test_GetCredentials_Public(t *testing.T) { @@
     			getAuthorizationTokenError: nil,
     			expectedError:              errors.New("error parsing username and password from authorization token"),
     		},
+    		{
+    			name:  "dualstack invalid authorization token",
+    			image: "ecr-public.aws.com",
+    			getAuthorizationTokenOutput: &ecrpublic.GetAuthorizationTokenOutput{
+    				AuthorizationData: &publictypes.AuthorizationData{
+    					AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte("foo"))),
+    				},
+    			},
+    			getAuthorizationTokenError: nil,
+    			expectedError:              errors.New("error parsing username and password from authorization token"),
+    		},
     	}
     	for _, testcase := range testcases {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,50 +1,51 @@
     module k8s.io/cloud-provider-aws
-    go 1.24.0
+    go 1.25.0
     require (
     	github.com/Pallinder/go-randomdata v1.2.0
-    	github.com/aws/aws-sdk-go-v2 v1.38.3
+    	github.com/aws/aws-sdk-go-v2 v1.41.1
     	github.com/aws/aws-sdk-go-v2/config v1.29.14
     	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.53.3
-    	github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2
+    	github.com/aws/aws-sdk-go-v2/service/ecr v1.55.1
     	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.27.2
     	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3
     	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
     	github.com/aws/aws-sdk-go-v2/service/kms v1.41.0
     	github.com/mitchellh/hashstructure/v2 v2.0.2
-    	github.com/onsi/ginkgo/v2 v2.23.0
-    	github.com/onsi/gomega v1.36.2
+    	github.com/onsi/ginkgo/v2 v2.27.2
+    	github.com/onsi/gomega v1.38.2
     	github.com/samber/lo v1.49.1
-    	github.com/spf13/cobra v1.9.1
-    	github.com/spf13/pflag v1.0.6
-    	github.com/stretchr/testify v1.10.0
+    	github.com/spf13/cobra v1.10.0
+    	github.com/spf13/pflag v1.0.9
+    	github.com/stretchr/testify v1.11.1
     	golang.org/x/time v0.11.0
     	gopkg.in/gcfg.v1 v1.2.3
-    	k8s.io/api v0.34.0
-    	k8s.io/apimachinery v0.34.0
-    	k8s.io/client-go v0.34.0
-    	k8s.io/cloud-provider v0.34.0
-    	k8s.io/code-generator v0.34.0
-    	k8s.io/component-base v0.34.0
-    	k8s.io/controller-manager v0.34.0
+    	k8s.io/api v0.35.0
+    	k8s.io/apimachinery v0.35.0
+    	k8s.io/client-go v0.35.0
+    	k8s.io/cloud-provider v0.35.0
+    	k8s.io/code-generator v0.35.0
+    	k8s.io/component-base v0.35.0
+    	k8s.io/controller-manager v0.35.0
     	k8s.io/klog/v2 v2.130.1
-    	k8s.io/kubelet v0.34.0
-    	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
+    	k8s.io/kubelet v0.35.0
+    	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
     	sigs.k8s.io/controller-runtime v0.20.3
     )
     require (
     	cel.dev/expr v0.24.0 // indirect
+    	github.com/Masterminds/semver/v3 v3.4.0 // indirect
     	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
     	github.com/google/btree v1.1.3 // indirect
-    	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
+    	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
     	github.com/kylelemons/godebug v1.1.0 // indirect
-    	github.com/prometheus/client_golang v1.22.0 // indirect
-    	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-    	go.yaml.in/yaml/v2 v2.4.2 // indirect
+    	github.com/prometheus/client_golang v1.23.2 // indirect
+    	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+    	go.yaml.in/yaml/v2 v2.4.3 // indirect
     	go.yaml.in/yaml/v3 v3.0.4 // indirect
-    	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+    	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
     	gopkg.in/inf.v0 v0.9.1 // indirect
     	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
     	gopkg.in/warnings.v0 v0.1.2 // indirect
@@ Expand All / @@ -59,16 +60,16 @@ require ( @@
     	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
     	github.com/aws/aws-sdk-go-v2/credentials v1.17.67
     	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.31
-    	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect
-    	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect
+    	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
+    	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
     	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
     	github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0
     	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
     	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect
     	github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
     	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
     	github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
-    	github.com/aws/smithy-go v1.23.0
+    	github.com/aws/smithy-go v1.24.0
     	github.com/beorn7/perks v1.0.1 // indirect
     	github.com/blang/semver/v4 v4.0.0 // indirect
     	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ Expand All / @@ -80,7 +81,7 @@ require ( @@
     	github.com/felixge/httpsnoop v1.0.4 // indirect
     	github.com/fsnotify/fsnotify v1.9.0 // indirect
     	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-    	github.com/go-logr/logr v1.4.2 // indirect
+    	github.com/go-logr/logr v1.4.3 // indirect
     	github.com/go-logr/stdr v1.2.2 // indirect
     	github.com/go-openapi/jsonpointer v0.21.0 // indirect
     	github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ Expand All / @@ -94,56 +95,54 @@ require ( @@
     	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
     	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
     	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-    	github.com/jmespath/go-jmespath v0.4.0 // indirect
     	github.com/josharian/intern v1.0.0 // indirect
     	github.com/json-iterator/go v1.1.12 // indirect
     	github.com/mailru/easyjson v0.7.7 // indirect
     	github.com/moby/term v0.5.0 // indirect
     	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
     	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
     	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-    	github.com/pkg/errors v0.9.1 // indirect
     	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-    	github.com/prometheus/client_model v0.6.1 // indirect
-    	github.com/prometheus/common v0.62.0 // indirect
-    	github.com/prometheus/procfs v0.15.1 // indirect
+    	github.com/prometheus/client_model v0.6.2 // indirect
+    	github.com/prometheus/common v0.66.1 // indirect
+    	github.com/prometheus/procfs v0.16.1 // indirect
     	github.com/stoewer/go-strcase v1.3.0 // indirect
     	github.com/stretchr/objx v0.5.2 // indirect
     	github.com/x448/float16 v0.8.4 // indirect
-    	go.etcd.io/etcd/api/v3 v3.6.4 // indirect
-    	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
-    	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
+    	go.etcd.io/etcd/api/v3 v3.6.5 // indirect
+    	go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
+    	go.etcd.io/etcd/client/v3 v3.6.5 // indirect
     	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
-    	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-    	go.opentelemetry.io/otel v1.35.0 // indirect
+    	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+    	go.opentelemetry.io/otel v1.40.0 // indirect
     	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
     	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-    	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-    	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-    	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+    	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+    	go.opentelemetry.io/otel/sdk v1.40.0 // indirect
+    	go.opentelemetry.io/otel/trace v1.40.0 // indirect
     	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
     	go.uber.org/multierr v1.11.0 // indirect
     	go.uber.org/zap v1.27.0 // indirect
-    	golang.org/x/crypto v0.36.0 // indirect
+    	golang.org/x/crypto v0.45.0 // indirect
     	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-    	golang.org/x/mod v0.23.0 // indirect
-    	golang.org/x/net v0.38.0 // indirect
-    	golang.org/x/oauth2 v0.27.0 // indirect
-    	golang.org/x/sync v0.12.0
-    	golang.org/x/sys v0.31.0 // indirect
-    	golang.org/x/term v0.30.0 // indirect
-    	golang.org/x/text v0.23.0 // indirect
-    	golang.org/x/tools v0.30.0 // indirect
+    	golang.org/x/mod v0.29.0 // indirect
+    	golang.org/x/net v0.47.0 // indirect
+    	golang.org/x/oauth2 v0.30.0 // indirect
+    	golang.org/x/sync v0.18.0
+    	golang.org/x/sys v0.40.0 // indirect
+    	golang.org/x/term v0.37.0 // indirect
+    	golang.org/x/text v0.31.0 // indirect
+    	golang.org/x/tools v0.38.0 // indirect
     	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-    	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
-    	google.golang.org/grpc v1.72.1 // indirect
-    	google.golang.org/protobuf v1.36.5 // indirect
-    	k8s.io/apiserver v0.34.0 // indirect
-    	k8s.io/component-helpers v0.34.0 // indirect
-    	k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
-    	k8s.io/kms v0.34.0 // indirect
-    	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+    	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+    	google.golang.org/grpc v1.72.2 // indirect
+    	google.golang.org/protobuf v1.36.8 // indirect
+    	k8s.io/apiserver v0.35.0 // indirect
+    	k8s.io/component-helpers v0.35.0 // indirect
+    	k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
+    	k8s.io/kms v0.35.0 // indirect
+    	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
     	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
-    	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+    	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
     	sigs.k8s.io/yaml v1.6.0 // indirect
     )

OCPCLOUD-3276,OCPBUGS-76344,OCPBUGS-69888,OCPBUGS-78289: Merge https://github.com/kubernetes/cloud-provider-aws:master (ea961d6) into main #131

Uh oh!

OCPCLOUD-3276,OCPBUGS-76344,OCPBUGS-69888,OCPBUGS-78289: Merge https://github.com/kubernetes/cloud-provider-aws:master (ea961d6) into main #131

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

coderabbitai bot Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!