aws-iam-authenticator: update to 0.5.5

The authenticator began requiring the use of the v1beta Kubernetes API in kubernetes-sigs/aws-iam-authenticator#386, so we change our kubeconfigs to match.
cbgbt · Mar 25, 2022 · 0fbe775 · 0fbe775
1 parent c86796c
commit 0fbe775
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 16 deletions.
diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml
@@ -12,13 +12,8 @@ path = "pkg.rs"
 releases-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.3/aws-iam-authenticator-0.5.3.tar.gz"
-sha512 = "430af9fd04b9a94205a485281fb668f5bc18cdac569de0232fa98e08ebb0e08a8d233537bd3373a5f1e53cf529bc2050aebc34a4a53c8b29a831070e34213210"
-
-# This blob includes a patch which updates the vendored go dependencies of aws-iam-authenticator, which weren't updated upstream for the 0.5.3 release.
-[[package.metadata.build-package.external-files]]
-url = "https://cache.bottlerocket.aws/aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch/39c9ef0c143b4a6c1374c24cdd7a13a8f5662f206a3200f6d07224359ec0f8350e1456510e9c891fd2e01ac9d261b2d51239a03883b88f1936d8735a01d3bf5f/aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch"
-sha512 = "39c9ef0c143b4a6c1374c24cdd7a13a8f5662f206a3200f6d07224359ec0f8350e1456510e9c891fd2e01ac9d261b2d51239a03883b88f1936d8735a01d3bf5f"
+url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.5/aws-iam-authenticator-0.5.5.tar.gz"
+sha512 = "24c2a7fd141f921e18c17f4c7e90bbf5325cc6fad3b35753c0da2d879cf64d8f6af0130f8c45ec7693d6fce043181abbd04a911e6fa778f686bd5c313631ed0f"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/aws-iam-authenticator/aws-iam-authenticator.spec b/packages/aws-iam-authenticator/aws-iam-authenticator.spec
@@ -2,7 +2,7 @@
 %global gorepo aws-iam-authenticator
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 0.5.3
+%global gover 0.5.5
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0
@@ -16,9 +16,6 @@ URL: https://%{goimport}
 Source0: https://%{goimport}/archive/v%{gover}/%{gorepo}-%{gover}.tar.gz
 Source1000: clarify.toml
 
-# 0.5.3 release did not include necessary vendored dependencies.
-Patch0001: aws-iam-authenticator-0.5.3-Update-vendored-go-dependencies.patch
-
 BuildRequires: git
 BuildRequires: %{_cross_os}glibc-devel
 

diff --git a/packages/kubernetes-1.18/kubelet-kubeconfig b/packages/kubernetes-1.18/kubelet-kubeconfig
@@ -20,7 +20,7 @@ users:
 {{#if settings.kubernetes.cluster-name}}
   user:
     exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
+      apiVersion: client.authentication.k8s.io/v1beta1
       command: "/usr/bin/aws-iam-authenticator"
       args:
       - token

diff --git a/packages/kubernetes-1.19/kubelet-kubeconfig b/packages/kubernetes-1.19/kubelet-kubeconfig
@@ -20,7 +20,7 @@ users:
 {{#if settings.kubernetes.cluster-name}}
   user:
     exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
+      apiVersion: client.authentication.k8s.io/v1beta1
       command: "/usr/bin/aws-iam-authenticator"
       args:
       - token

diff --git a/packages/kubernetes-1.20/kubelet-kubeconfig b/packages/kubernetes-1.20/kubelet-kubeconfig
@@ -20,7 +20,7 @@ users:
 {{#if settings.kubernetes.cluster-name}}
   user:
     exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
+      apiVersion: client.authentication.k8s.io/v1beta1
       command: "/usr/bin/aws-iam-authenticator"
       args:
       - token

diff --git a/packages/kubernetes-1.21/kubelet-kubeconfig b/packages/kubernetes-1.21/kubelet-kubeconfig
@@ -20,7 +20,7 @@ users:
 {{#if settings.kubernetes.cluster-name}}
   user:
     exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
+      apiVersion: client.authentication.k8s.io/v1beta1
       command: "/usr/bin/aws-iam-authenticator"
       args:
       - token

diff --git a/packages/kubernetes-1.22/kubelet-kubeconfig b/packages/kubernetes-1.22/kubelet-kubeconfig
@@ -20,7 +20,7 @@ users:
 {{#if settings.kubernetes.cluster-name}}
   user:
     exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
+      apiVersion: client.authentication.k8s.io/v1beta1
       command: "/usr/bin/aws-iam-authenticator"
       args:
       - token