Skip to content

Commit 95bc574

Browse files
authored
Merge pull request #795 from shizuchanw/release-0.6
Cherry pick commits from master branch
2 parents de99594 + 4afdfe0 commit 95bc574

File tree

9 files changed

+444
-423
lines changed

9 files changed

+444
-423
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.7
1+
1.23.4

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2024-08-13-1723575672.2
15-
ARG golang_image=public.ecr.aws/docker/library/golang:1.22.5
14+
ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2024-10-01-1727740884.2023
15+
ARG golang_image=public.ecr.aws/docker/library/golang:1.23.4
1616

1717
FROM --platform=$BUILDPLATFORM $golang_image AS builder
1818
WORKDIR /go/src/github.com/kubernetes-sigs/aws-iam-authenticator
1919
COPY . .
2020
RUN go version
21-
RUN go mod download
21+
2222
ARG TARGETOS TARGETARCH
23-
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make bin
23+
RUN GOPROXY=direct GOOS=$TARGETOS GOARCH=$TARGETARCH make bin
2424
RUN chown 65532 _output/bin/aws-iam-authenticator
2525

26-
FROM --platform=$TARGETPLATFORM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.9.0-eks-1-21-4 as go-runner
26+
FROM --platform=$TARGETPLATFORM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.16.4-eks-1-32-2 AS go-runner
2727

2828
FROM --platform=$TARGETPLATFORM $image
29-
COPY --from=go-runner /usr/local/bin/go-runner /usr/local/bin/go-runner
29+
COPY --from=go-runner /go-runner /usr/local/bin/go-runner
3030
COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-iam-authenticator/_output/bin/aws-iam-authenticator /aws-iam-authenticator
3131
ENTRYPOINT ["/aws-iam-authenticator"]

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/aws-iam-authenticator
22

3-
go 1.22.7
3+
go 1.23.4
44

55
require (
66
github.com/aws/aws-sdk-go v1.54.6
@@ -14,13 +14,13 @@ require (
1414
github.com/spf13/afero v1.11.0
1515
github.com/spf13/cobra v1.8.1
1616
github.com/spf13/viper v1.7.0
17-
golang.org/x/time v0.5.0
17+
golang.org/x/time v0.7.0
1818
gopkg.in/yaml.v2 v2.4.0
19-
k8s.io/api v0.31.0
20-
k8s.io/apimachinery v0.31.0
21-
k8s.io/client-go v0.31.0
22-
k8s.io/code-generator v0.31.0
23-
k8s.io/component-base v0.31.0
19+
k8s.io/api v0.32.0
20+
k8s.io/apimachinery v0.32.0
21+
k8s.io/client-go v0.32.0
22+
k8s.io/code-generator v0.32.0
23+
k8s.io/component-base v0.32.0
2424
k8s.io/sample-controller v0.26.1
2525
sigs.k8s.io/yaml v1.4.0
2626
)
@@ -35,17 +35,15 @@ require (
3535
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
3636
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3737
github.com/go-logr/logr v1.4.2 // indirect
38-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
38+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3939
github.com/go-openapi/jsonreference v0.20.4 // indirect
40-
github.com/go-openapi/swag v0.22.7 // indirect
40+
github.com/go-openapi/swag v0.23.0 // indirect
4141
github.com/gogo/protobuf v1.3.2 // indirect
42-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4342
github.com/golang/protobuf v1.5.4 // indirect
4443
github.com/google/gnostic-models v0.6.8 // indirect
4544
github.com/google/gofuzz v1.2.0 // indirect
4645
github.com/google/uuid v1.6.0 // indirect
4746
github.com/hashicorp/hcl v1.0.0 // indirect
48-
github.com/imdario/mergo v0.3.16 // indirect
4947
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5048
github.com/jmespath/go-jmespath v0.4.0 // indirect
5149
github.com/josharian/intern v1.0.0 // indirect
@@ -66,23 +64,25 @@ require (
6664
github.com/spf13/pflag v1.0.5 // indirect
6765
github.com/subosito/gotenv v1.2.0 // indirect
6866
github.com/x448/float16 v0.8.4 // indirect
69-
golang.org/x/mod v0.17.0 // indirect
70-
golang.org/x/net v0.26.0 // indirect
71-
golang.org/x/oauth2 v0.21.0 // indirect
72-
golang.org/x/sync v0.7.0 // indirect
73-
golang.org/x/sys v0.21.0 // indirect
74-
golang.org/x/term v0.21.0 // indirect
75-
golang.org/x/text v0.16.0 // indirect
76-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
77-
google.golang.org/protobuf v1.34.2 // indirect
67+
go.opentelemetry.io/otel v1.28.0 // indirect
68+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
69+
golang.org/x/mod v0.21.0 // indirect
70+
golang.org/x/net v0.30.0 // indirect
71+
golang.org/x/oauth2 v0.23.0 // indirect
72+
golang.org/x/sync v0.8.0 // indirect
73+
golang.org/x/sys v0.26.0 // indirect
74+
golang.org/x/term v0.25.0 // indirect
75+
golang.org/x/text v0.19.0 // indirect
76+
golang.org/x/tools v0.26.0 // indirect
77+
google.golang.org/protobuf v1.35.1 // indirect
7878
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7979
gopkg.in/inf.v0 v0.9.1 // indirect
8080
gopkg.in/ini.v1 v1.51.0 // indirect
8181
gopkg.in/yaml.v3 v3.0.1 // indirect
82-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
82+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
8383
k8s.io/klog/v2 v2.130.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
85-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
86-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
87-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
84+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
85+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
86+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
87+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
8888
)

0 commit comments

Comments
 (0)