OCPCLOUD-2725: Merge https://github.com/kubernetes/cloud-provider-aws:master (d7e05d5) into master #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

openshift-merge-bot merged 44 commits into openshift:master from openshift-cloud-team:rebase-bot-master

Sep 23, 2024

.ci-operator.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
     build_root_image:
       name: release
       namespace: openshift
-      tag: rhel-9-release-golang-1.22-openshift-4.17
+      tag: rhel-9-release-golang-1.22-openshift-4.18

.github/workflows/update-deps.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ jobs: @@
           pull-requests: write
         steps:
           - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-          - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
+          - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
             with:
               go-version-file: go.mod
           - name: Update Dependencies
@@ Expand Down @@

.ko.yaml

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

Dockerfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,15 +14,15 @@
  
    ##                               BUILD ARGS                                   ##

    ################################################################################

    # This build arg allows the specification of a custom Golang image.

    ARG GOLANG_IMAGE=golang:1.22.3

    ARG GOLANG_IMAGE=golang:1.22.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.3.1-go1.22.3-bookworm.0

    ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.5-bookworm.0

    ################################################################################

    ##                              BUILD STAGE                                   ##

Dockerfile.openshift

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,4 @@
  
    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder

    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder

    WORKDIR /build

    COPY . .

    @@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
  
    	-o=aws-cloud-controller-manager \

    	cmd/aws-cloud-controller-manager/main.go

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

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

    LABEL description="AWS Cloud Controller Manager"

charts/aws-cloud-controller-manager/templates/daemonset.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,10 @@ spec: @@
           hostNetwork: true
           {{- end }}
           securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
+          {{- with .Values.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
           containers:
             - name: {{ .Chart.Name }}
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ Expand Down @@

charts/aws-cloud-controller-manager/values.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,9 @@ image: @@
         repository: registry.k8s.io/provider-aws/cloud-controller-manager
         tag: v1.27.1
+    # Specify image pull secrets
+    imagePullSecrets: []
     # nameOverride overrides `cloud-controller-manager.fullname`
     nameOverride: "aws-cloud-controller-manager"
@@ Expand Down Expand Up / @@ -95,6 +98,18 @@ clusterRoleRules: @@
       - serviceaccounts/token
       verbs:
       - create
+    - apiGroups:
+        - authentication.k8s.io
+      resources:
+        - tokenreviews
+      verbs:
+        - create
+    - apiGroups:
+        - authorization.k8s.io
+      resources:
+        - subjectaccessreviews
+      verbs:
+        - create
     # resources -- Pod resource requests and limits.
     resources:
@@ Expand Down @@

cloudbuild.yaml

-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.22.3-bookworm'
+      - name: 'docker.io/library/golang:1.22.5-bookworm'
         id: cloudbuild-artifacts
         entrypoint: make
         env:
@@ Expand Down @@

cmd/ecr-credential-provider/main.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ import ( @@
     const ecrPublicRegion string = "us-east-1"
     const ecrPublicHost string = "public.ecr.aws"
-    var ecrPrivateHostPattern = regexp.MustCompile(`^(\d{12})\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.(amazonaws\.com(\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov)$`)
+    var ecrPrivateHostPattern = regexp.MustCompile(`^(\d{12})\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.(amazonaws\.com(\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov|cloud\.adc-e\.uk|csp\.hci\.ic\.gov)$`)
     // ECR abstracts the calls we make to aws-sdk for testing purposes
     type ECR interface {
@@ Expand Down @@

cmd/ecr-credential-provider/main_test.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -368,6 +368,16 @@ func TestRegistryPatternMatch(t *testing.T) { @@
     		{"123456789012.dkr.cat.lala-land-1.awsamazon.com", false},
     		// too short
     		{"123456789012.lala-land-1.amazonaws.com", false},
+    		// iso
+    		{"123456789012.dkr.ecr.us-iso-east-1.c2s.ic.gov", true},
+    		// iso-b
+    		{"123456789012.dkr.ecr.us-isob-east-1.sc2s.sgov.gov", true},
+    		// iso-e
+    		{"123456789012.dkr.ecr.eu-isoe-west-1.cloud.adc-e.uk", true},
+    		// iso-f
+    		{"123456789012.dkr.ecr.us-isof-east-1.csp.hci.ic.gov", true},
+    		// invalid gov endpoint
+    		{"123456789012.dkr.ecr.us-iso-east-1.amazonaws.gov", false},
     	}
     	for _, g := range grid {
     		actual := ecrPrivateHostPattern.MatchString(g.Registry)
@@ Expand Down @@

go.mod

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,121 +1,120 @@
  
    module k8s.io/cloud-provider-aws

    go 1.22

    go 1.22.5

    require (

    	github.com/aws/aws-sdk-go v1.53.14

    	github.com/aws/aws-sdk-go v1.55.5

    	github.com/golang/mock v1.6.0

    	github.com/spf13/cobra v1.8.0

    	github.com/spf13/cobra v1.8.1

    	github.com/spf13/pflag v1.0.5

    	github.com/stretchr/testify v1.9.0

    	golang.org/x/time v0.5.0

    	golang.org/x/time v0.6.0

    	gopkg.in/gcfg.v1 v1.2.3

    	k8s.io/api v0.31.0-alpha.0

    	k8s.io/apimachinery v0.31.0-alpha.0

    	k8s.io/client-go v0.31.0-alpha.0

    	k8s.io/cloud-provider v0.31.0-alpha.0

    	k8s.io/code-generator v0.31.0-alpha.0

    	k8s.io/component-base v0.31.0-alpha.0

    	k8s.io/controller-manager v0.31.0-alpha.0

    	k8s.io/klog/v2 v2.120.1

    	k8s.io/kubelet v0.31.0-alpha.0

    	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0

    	k8s.io/api v0.32.0-alpha.0

    	k8s.io/apimachinery v0.32.0-alpha.0

    	k8s.io/client-go v0.32.0-alpha.0

    	k8s.io/cloud-provider v0.32.0-alpha.0

    	k8s.io/code-generator v0.32.0-alpha.0

    	k8s.io/component-base v0.32.0-alpha.0

    	k8s.io/controller-manager v0.32.0-alpha.0

    	k8s.io/klog/v2 v2.130.1

    	k8s.io/kubelet v0.32.0-alpha.0

    	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8

    )

    require (

    	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect

    	github.com/NYTimes/gziphandler v1.1.1 // indirect

    	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect

    	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect

    	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect

    	github.com/beorn7/perks v1.0.1 // indirect

    	github.com/blang/semver/v4 v4.0.0 // indirect

    	github.com/cenkalti/backoff/v4 v4.2.1 // indirect

    	github.com/cespare/xxhash/v2 v2.2.0 // indirect

    	github.com/cenkalti/backoff/v4 v4.3.0 // indirect

    	github.com/cespare/xxhash/v2 v2.3.0 // indirect

    	github.com/coreos/go-semver v0.3.1 // indirect

    	github.com/coreos/go-systemd/v22 v22.5.0 // indirect

    	github.com/davecgh/go-spew v1.1.1 // indirect

    	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

    	github.com/emicklei/go-restful/v3 v3.11.0 // indirect

    	github.com/evanphx/json-patch v5.6.0+incompatible // indirect

    	github.com/felixge/httpsnoop v1.0.4 // indirect

    	github.com/fsnotify/fsnotify v1.7.0 // indirect

    	github.com/go-logr/logr v1.4.1 // indirect

    	github.com/fxamacker/cbor/v2 v2.7.0 // indirect

    	github.com/go-logr/logr v1.4.2 // indirect

    	github.com/go-logr/stdr v1.2.2 // indirect

    	github.com/go-openapi/jsonpointer v0.19.6 // indirect

    	github.com/go-openapi/jsonreference v0.20.2 // indirect

    	github.com/go-openapi/swag v0.22.3 // indirect

    	github.com/go-openapi/swag v0.22.4 // indirect

    	github.com/gogo/protobuf v1.3.2 // indirect

    	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect

    	github.com/golang/protobuf v1.5.4 // indirect

    	github.com/google/cel-go v0.17.8 // indirect

    	github.com/google/cel-go v0.20.1 // indirect

    	github.com/google/gnostic-models v0.6.8 // indirect

    	github.com/google/go-cmp v0.6.0 // indirect

    	github.com/google/gofuzz v1.2.0 // indirect

    	github.com/google/uuid v1.3.1 // indirect

    	github.com/google/uuid v1.6.0 // indirect

    	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect

    	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect

    	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect

    	github.com/imdario/mergo v0.3.15 // 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/matttproud/golang_protobuf_extensions v1.0.4 // indirect

    	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // 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.2 // 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.0 // indirect

    	github.com/prometheus/client_golang v1.16.0 // indirect

    	github.com/prometheus/client_model v0.4.0 // indirect

    	github.com/prometheus/common v0.44.0 // indirect

    	github.com/prometheus/procfs v0.10.1 // indirect

    	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

    	github.com/prometheus/client_golang v1.19.1 // indirect

    	github.com/prometheus/client_model v0.6.1 // indirect

    	github.com/prometheus/common v0.55.0 // indirect

    	github.com/prometheus/procfs v0.15.1 // indirect

    	github.com/stoewer/go-strcase v1.3.0 // indirect

    	github.com/stretchr/objx v0.5.2 // indirect

    	go.etcd.io/etcd/api/v3 v3.5.10 // indirect

    	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

    	go.etcd.io/etcd/client/v3 v3.5.10 // indirect

    	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect

    	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect

    	go.opentelemetry.io/otel v1.20.0 // indirect

    	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect

    	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect

    	go.opentelemetry.io/otel/metric v1.20.0 // indirect

    	go.opentelemetry.io/otel/sdk v1.20.0 // indirect

    	go.opentelemetry.io/otel/trace v1.20.0 // indirect

    	go.opentelemetry.io/proto/otlp v1.0.0 // indirect

    	github.com/x448/float16 v0.8.4 // indirect

    	go.etcd.io/etcd/api/v3 v3.5.14 // indirect

    	go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect

    	go.etcd.io/etcd/client/v3 v3.5.14 // indirect

    	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect

    	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect

    	go.opentelemetry.io/otel v1.28.0 // indirect

    	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect

    	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect

    	go.opentelemetry.io/otel/metric v1.28.0 // indirect

    	go.opentelemetry.io/otel/sdk v1.28.0 // indirect

    	go.opentelemetry.io/otel/trace v1.28.0 // indirect

    	go.opentelemetry.io/proto/otlp v1.3.1 // indirect

    	go.uber.org/multierr v1.11.0 // indirect

    	go.uber.org/zap v1.26.0 // indirect

    	golang.org/x/crypto v0.22.0 // indirect

    	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect

    	golang.org/x/mod v0.15.0 // indirect

    	golang.org/x/net v0.24.0 // indirect

    	golang.org/x/oauth2 v0.11.0 // indirect

    	golang.org/x/sync v0.6.0 // indirect

    	golang.org/x/sys v0.19.0 // indirect

    	golang.org/x/term v0.19.0 // indirect

    	golang.org/x/text v0.14.0 // indirect

    	golang.org/x/tools v0.18.0 // indirect

    	google.golang.org/appengine v1.6.7 // indirect

    	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect

    	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

    	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect

    	google.golang.org/grpc v1.59.0 // indirect

    	google.golang.org/protobuf v1.33.0 // indirect

    	golang.org/x/crypto v0.24.0 // indirect

    	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect

    	golang.org/x/mod v0.17.0 // indirect

    	golang.org/x/net v0.26.0 // indirect

    	golang.org/x/oauth2 v0.21.0 // indirect

    	golang.org/x/sync v0.7.0 // indirect

    	golang.org/x/sys v0.21.0 // indirect

    	golang.org/x/term v0.21.0 // indirect

    	golang.org/x/text v0.16.0 // indirect

    	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect

    	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect

    	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect

    	google.golang.org/grpc v1.65.0 // indirect

    	google.golang.org/protobuf v1.34.2 // indirect

    	gopkg.in/evanphx/json-patch.v4 v4.12.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

    	gopkg.in/yaml.v2 v2.4.0 // indirect

    	gopkg.in/yaml.v3 v3.0.1 // indirect

    	k8s.io/apiserver v0.31.0-alpha.0 // indirect

    	k8s.io/component-helpers v0.31.0-alpha.0 // indirect

    	k8s.io/apiserver v0.32.0-alpha.0 // indirect

    	k8s.io/component-helpers v0.32.0-alpha.0 // indirect

    	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect

    	k8s.io/kms v0.31.0-alpha.0 // indirect

    	k8s.io/kms v0.32.0-alpha.0 // indirect

    	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

    	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect

    	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

    	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

    	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

    	sigs.k8s.io/yaml v1.3.0 // indirect

    	sigs.k8s.io/yaml v1.4.0 // indirect

    )

    // Cannot be removed until all dependencies use crypto library v0.17.0 or higher

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPCLOUD-2725: Merge https://github.com/kubernetes/cloud-provider-aws:master (d7e05d5) into master #90

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!