feat: add install oidc-login scripts

Author: michael12312

Dockerfile.deps

@@ -1,6 +1,7 @@
 FROM alpine:3.17 AS builder
 
 ARG AWS_IAM_AUTH_VERSION=0.5.9
+ARG ODIC_LOGIN_VERSION=1.28.0
 ARG KUBELOGIN_VERSION=0.0.14
 ARG KUBECTL_VERSION=1.22.11
 ARG HELM_VERSION=3.9.0
@@ -19,6 +20,13 @@ RUN curl -L \
     https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_AUTH_VERSION}/aws-iam-authenticator_${AWS_IAM_AUTH_VERSION}_${TARGETOS}_${TARGETARCH} -o aws-iam-authenticator && \
     chmod +x ./aws-iam-authenticator
 
+# oidclogin
+RUN curl -L \
+    https://github.com/int128/kubelogin/releases/download/v${ODIC_LOGIN_VERSION}/kubelogin_${TARGETOS}_${TARGETARCH}.zip -o oidclogin.zip && \
+    unzip oidclogin.zip  && \
+    mv kubelogin kubectl-oidc_login && \
+    chmod +x ./kubectl-oidc_login
+
 # kubelogin
 RUN curl -L \
     https://github.com/Azure/kubelogin/releases/download/v${KUBELOGIN_VERSION}/kubelogin-${TARGETOS}-${TARGETARCH}.zip -o kubelogin.zip && \
@@ -39,6 +47,7 @@ ARG TARGETVARIANT
 
 COPY --from=builder kubectl .
 COPY --from=builder aws-iam-authenticator .
+COPY --from=builder kubectl-oidc_login .
 COPY --from=builder bin/${TARGETOS}_${TARGETARCH}/kubelogin .
 COPY --from=builder ${TARGETOS}-${TARGETARCH}/helm .
 COPY kconnect .

docs/book/src/commands/use.md

@@ -33,6 +33,9 @@ specified cluster provider.
   [kubelogin](https://github.com/Azure/kubelogin)
   [azure-cli](https://github.com/Azure/azure-cli)
 
+* Note: kconnect use oidc requires kube-oidc-login and rename to kubectl-oidc_login.
+  [kube-oidc-login](https://github.com/int128/kubelogin)
+
 
 ```bash
 kconnect use [flags]

docs/book/src/commands/use_oidc.md

@@ -19,6 +19,9 @@ entry ID or alias.  When the user reconnects using a connection history entry,
 kconnect regenerates the kubectl configuration context and refreshes their access
 token.
 
+* Note: kconnect use oidc requires kube-oidc-login and rename to kubectl-oidc_login.
+  [kube-oidc-login](https://github.com/int128/kubelogin)
+
 
 ```bash
 kconnect use oidc [flags]

internal/commands/use/use.go

@@ -82,6 +82,10 @@ specified cluster provider.
 * Note: kconnect use aks requires kubelogin and azure cli.
   [kubelogin](https://github.com/Azure/kubelogin)
   [azure-cli](https://github.com/Azure/azure-cli)
+`
+	oidcDescNote = `
+* Note: kconnect use oidc requires kube-oidc-login and rename to kubectl-oidc_login.
+  [kube-oidc-login](https://github.com/int128/kubelogin)
 `
 	usageExample = `
   # Connect to EKS and choose an available EKS cluster.
@@ -101,7 +105,7 @@ specified cluster provider.
 
 // Command creates the use command
 func Command() (*cobra.Command, error) {
-	longDesc := longDescHead + longDescBody + longDescFoot + eksDescNote + aksDescNote
+	longDesc := longDescHead + longDescBody + longDescFoot + eksDescNote + aksDescNote + oidcDescNote
 	useCmd := &cobra.Command{
 		Use:     "use",
 		Short:   shortDesc,
@@ -140,6 +144,8 @@ func createProviderCmd(registration *registry.DiscoveryPluginRegistration) (*cob
 		providerLongDesc += eksDescNote
 	} else if registration.Name == "aks" {
 		providerLongDesc += aksDescNote
+	} else if registration.Name == "oidc" {
+		providerLongDesc += oidcDescNote
 	}
 	providerUsageExample := registration.UsageExample + usageExampleFoot
 

scripts/install-kconnect.sh

@@ -12,13 +12,15 @@ latest_helm_release_tag=$(curl -fsSLI -o /dev/null -w %{url_effective} https://g
 latest_kubelogin_release_tag=$(curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/Azure/kubelogin/releases/latest | sed 's#.*/##')
 latest_aws_iam_authenticator_release_tag=$(curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/latest | sed 's#.*/##' | cut -c2-)
 latest_azure_cli_release_tag=$(curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/Azure/azure-cli/releases/latest | sed 's#.*/##')
+latest_oidc_login_release_tag=$(curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/int128/kubelogin/releases/latest | sed 's#.*/##')
 
 echo "kconnect version: $latest_kconnect_release_tag"
 echo "kubectl version: $latest_kubectl_release_tag"
 echo "helm version: $latest_helm_release_tag"
 echo "kubelogin version: $latest_kubelogin_release_tag"
 echo "aws-iam-authenticator version: $latest_aws_iam_authenticator_release_tag"
 echo "azure-cli version: $latest_azure_cli_release_tag"
+echo "oidc-login version: $latest_oidc_login_release_tag"
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     # linux
@@ -49,13 +51,14 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     aws_iam_authenticator_url=$(echo "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/vTAG/aws-iam-authenticator_TAG_linux_ARCH" | sed "s/TAG/$latest_aws_iam_authenticator_release_tag/g" | sed "s/ARCH/$arch/" )
     kubelogin_url=$(echo "https://github.com/Azure/kubelogin/releases/download/TAG/kubelogin-linux-amd64.zip" | sed "s/TAG/$latest_kubelogin_release_tag/")
     azure_url="https://aka.ms/InstallAzureCli"
-
+    oidc_login_url=$(echo "https://github.com/int128/kubelogin/releases/download/TAG/kubelogin_linux_ARCH.zip" | sed "s/TAG/$latest_oidc_login_release_tag/" | sed "s/ARCH/$arch/" )
     echo "kconnect url: $kconnect_url" 
     echo "kubectl url: $kubectl_url"
     echo "helm url: $helm_url"
     echo "aws_iam_authenticator url: $aws_iam_authenticator_url"
     echo "kubelogin url: $kubelogin_url"
     echo "azure url: $azure_url"
+    echo "oidc-login url: $oidc_login_url"
 
     # download 
     curl -s -L $kconnect_url -o kconnect.tar.gz
@@ -64,11 +67,14 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     curl -s -L $aws_iam_authenticator_url -o aws-iam-authenticator
     curl -s -L $kubelogin_url -o kubelogin.zip
     curl -s -L $azure_url -o azure-cli-install.sh
+    curl -s -L $oidc_login_url -o oidclogin.zip
 
     # unzip
     tar -xf kconnect.tar.gz
     tar -xf helm.tar.gz
     mv linux-*/helm .
+    unzip -qq oidclogin.zip
+    mv kubelogin kubectl-oidc_login
     unzip -qq kubelogin.zip
     mv bin/linux_amd64/kubelogin .
 
@@ -78,12 +84,14 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     rm -rf linux-*
     rm -f kubelogin.zip
     rm -rf bin
+    rm -f oidclogin.zip
 
     # permissions
     chmod +x kubectl
     chmod +x aws-iam-authenticator
     chmod +x kubelogin
     chmod +x azure-cli-install.sh
+    chmod +x kubectl-oidc_login
 
 elif [[ "$OSTYPE" == "darwin"* ]]; then
 
@@ -94,25 +102,30 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     aws_iam_authenticator_url=$(echo "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/vTAG/aws-iam-authenticator_TAG_darwin_amd64" | sed "s/TAG/$latest_aws_iam_authenticator_release_tag/g" )
     kubelogin_url=$(echo "https://github.com/Azure/kubelogin/releases/download/TAG/kubelogin-darwin-amd64.zip" | sed "s/TAG/$latest_kubelogin_release_tag/")
     azure_url="https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-macos"
+    oidc_login_url=$(echo "https://github.com/int128/kubelogin/releases/download/TAG/kubelogin_darwin_amd64.zip" | sed "s/TAG/$latest_oidc_login_release_tag/" )
 
     echo "kconnect url: $kconnect_url" 
     echo "kubectl url: $kubectl_url"
     echo "helm url: $helm_url"
     echo "aws_iam_authenticator url: $aws_iam_authenticator_url"
     echo "kubelogin url: $kubelogin_url"
     echo "azure url: $azure_url"
+    echo "oidc-login url: $oidc_login_url"
 
     # download 
     curl -s -L $kconnect_url -o kconnect.tar.gz
     curl -s -LO $kubectl_url
     curl -s -L $helm_url -o helm.tar.gz
     curl -s -L $aws_iam_authenticator_url -o aws-iam-authenticator
     curl -s -L $kubelogin_url -o kubelogin.zip
+    curl -s -L $oidc_login_url -o oidclogin.zip
 
     # unzip
     tar -xf kconnect.tar.gz
     tar -xf helm.tar.gz
     mv darwin-*/helm .
+    unzip -qq oidclogin.zip
+    mv kubelogin kubectl-oidc_login
     unzip -qq kubelogin.zip
     mv bin/darwin_amd64/kubelogin .
 
@@ -122,11 +135,13 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     rm -rf darwin-*
     rm -f kubelogin.zip
     rm -rf bin
+    rm -f oidclogin.zip
 
     # permissions
     chmod +x kubectl
     chmod +x aws-iam-authenticator
     chmod +x kubelogin
+    chmod +x kubectl-oidc_login
 
 elif [[ "$OSTYPE" == "msys" ]]; then
     # Win git bash