upgpkg: google-cloud-sdk-gke-gcloud-auth-plugin 398.0.0-2

refactor(google-cloud-sdk-gke-gcloud-auth-plugin): switch from dev to tarball

4 files changed, 22 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f0b0885a8e2..7ee7a06ae5d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = google-cloud-sdk-gke-gcloud-auth-plugin
 	pkgdesc = A google-cloud-sdk component that provides a kubectl authentication plugin for GKE.
 	pkgver = 398.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke
 	install = google-cloud-sdk-gke-gcloud-auth-plugin.install
 	arch = x86_64
 	license = Apache
 	depends = google-cloud-sdk
 	options = !strip
-	source = google-cloud-sdk-gke-gcloud-auth-plugin-398.0.0.deb::https://packages.cloud.google.com/apt/pool/google-cloud-cli-gke-gcloud-auth-plugin_398.0.0-0_amd64_0d21b4bd6b1392650529b05831f3928f80b8209988498f9927f486ff5d58129e.deb
-	sha256sums = 0d21b4bd6b1392650529b05831f3928f80b8209988498f9927f486ff5d58129e
+	source = https://storage.googleapis.com/cloud-sdk-release/for_packagers/linux/google-cloud-cli-gke-gcloud-auth-plugin_398.0.0.orig_amd64.tar.gz
+	source = google-cloud-sdk-gke-gcloud-auth-plugin.sh
+	sha256sums = 6c8c99d4f0bea24c5fb67c1e18a3196cbaffe55ea5de6b157c5a2a620fbcd317
+	sha256sums = 4432c1e71c39cb0914baa4df6c8699adc7e633163da7be87ac159d5b320cb346
 
 pkgname = google-cloud-sdk-gke-gcloud-auth-plugin
diff --git a/PKGBUILD b/PKGBUILD
index 96335b3e3eda..46972365796d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,23 @@
 # Maintainer: Winston Astrachan <winston dot astrachan at gmail dot com>
 
 pkgname=google-cloud-sdk-gke-gcloud-auth-plugin
-_debname=google-cloud-cli-gke-gcloud-auth-plugin
-_debshasum=0d21b4bd6b1392650529b05831f3928f80b8209988498f9927f486ff5d58129e 
 pkgver=398.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A google-cloud-sdk component that provides a kubectl authentication plugin for GKE."
 arch=('x86_64')
 url="https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke"
 license=('Apache')
 depends=('google-cloud-sdk')
 options=('!strip')
-source=("$pkgname-$pkgver.deb::https://packages.cloud.google.com/apt/pool/${_debname}_${pkgver}-0_amd64_${_debshasum}.deb")
-sha256sums=("$_debshasum")
+source=(
+    "https://storage.googleapis.com/cloud-sdk-release/for_packagers/linux/google-cloud-cli-gke-gcloud-auth-plugin_${pkgver}.orig_amd64.tar.gz"
+    'google-cloud-sdk-gke-gcloud-auth-plugin.sh')
+sha256sums=('6c8c99d4f0bea24c5fb67c1e18a3196cbaffe55ea5de6b157c5a2a620fbcd317'
+            '4432c1e71c39cb0914baa4df6c8699adc7e633163da7be87ac159d5b320cb346')
 install="${pkgname}.install"
 
-prepare() {
-    tar -axvf "${srcdir}/data.tar.xz"
-}
-
 package() {
-    cd "$srcdir"
+    cd "$srcdir/google-cloud-sdk"
 
     # Install plugin manifests and snapshots
     manifests=(
@@ -31,13 +28,13 @@ package() {
     )
     for item in ${manifests[@]}; do
         install -Dm644 \
-            "${srcdir}/usr/lib/google-cloud-sdk/.install/${item}" \
+            ".install/${item}" \
             "${pkgdir}/opt/google-cloud-sdk/.install/${item}"
     done
 
     # Install plugin binary
     install -Dm755 \
-        "${srcdir}/usr/lib/google-cloud-sdk/bin/gke-gcloud-auth-plugin" \
+        "bin/gke-gcloud-auth-plugin" \
         "${pkgdir}/opt/google-cloud-sdk/bin/gke-gcloud-auth-plugin"
 
     # Symlink plugin binary
@@ -45,4 +42,9 @@ package() {
     ln -s \
         "/opt/google-cloud-sdk/bin/gke-gcloud-auth-plugin" \
         "${pkgdir}/usr/bin/gke-gcloud-auth-plugin"
+
+    # Install profile.d environment exports
+    install -Dm755 \
+        "${srcdir}/google-cloud-sdk-gke-gcloud-auth-plugin.sh" \
+        "${pkgdir}/etc/profile.d/google-cloud-sdk-gke-gcloud-auth-plugin.sh"
 }
diff --git a/google-cloud-sdk-gke-gcloud-auth-plugin.install b/google-cloud-sdk-gke-gcloud-auth-plugin.install
index a15e8b78c88b..a8d34ee733ec 100644
--- a/google-cloud-sdk-gke-gcloud-auth-plugin.install
+++ b/google-cloud-sdk-gke-gcloud-auth-plugin.install
@@ -1,4 +1,5 @@
 post_install() {
+    printf "${bold}${yellow}==============================================================================${reset}\n"
     echo ""
     note_header "Important information about kubectl versions < 1.25"
     echo ""
@@ -17,6 +18,7 @@ post_install() {
     note ""
     note "https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke"
     echo ""
+    printf "${bold}${yellow}==============================================================================${reset}\n"
 }
 
 post_upgrade() {
diff --git a/google-cloud-sdk-gke-gcloud-auth-plugin.sh b/google-cloud-sdk-gke-gcloud-auth-plugin.sh
new file mode 100755
index 000000000000..31be1bca64d6
--- /dev/null
+++ b/google-cloud-sdk-gke-gcloud-auth-plugin.sh
@@ -0,0 +1 @@
+export USE_GKE_GCLOUD_AUTH_PLUGIN=True