Merge pull request #2 from lizardruss/exec-v1beta1

fix: use client.authentication.k8s.io/v1beta1

Author: lizardruss

go.mod

@@ -2,18 +2,25 @@ module github.com/devspace-cloud/devspace-cloud-plugin
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/daviddengcn/go-colortext v1.0.0 // indirect
 	github.com/devspace-cloud/devspace v1.1.1-0.20200724074930-ec77a1851818
+	github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494 // indirect
 	github.com/machinebox/graphql v0.2.2
+	github.com/matryer/is v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/otiai10/mint v1.3.3 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/rhysd/go-github-selfupdate v0.0.0-20180520142321-41c1bbb0804a
+	github.com/rjeczalik/notify v0.9.2 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
-	gopkg.in/yaml.v2 v2.2.8
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
+	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.18.2
 	k8s.io/apimachinery v0.18.6
@@ -23,7 +30,6 @@ require (
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
 	github.com/agl/ed25519 => github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412
-	golang.org/x/sys => golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9
 )
 
 go 1.13

go.sum

@@ -32,7 +32,7 @@ if [[ -z "${DEVSPACE_BUILD_PLATFORMS}" ]]; then
 fi
 
 if [[ -z "${DEVSPACE_BUILD_ARCHS}" ]]; then
-    DEVSPACE_BUILD_ARCHS="amd64 386"
+    DEVSPACE_BUILD_ARCHS="amd64 386 arm64"
 fi
 
 mkdir -p "${DEVSPACE_ROOT}/release"
@@ -52,7 +52,7 @@ for OS in ${DEVSPACE_BUILD_PLATFORMS[@]}; do
       CGO_ENABLED=0
     fi
 
-    if [[ "${ARCH}" == "386" && "${OS}" == "darwin" ]]; then
+    if [[ ("${ARCH}" == "386" && "${OS}" == "darwin") || ("${ARCH}" == "arm64" && "${OS}" != "darwin") ]]; then
         # darwin 386 is deprecated and shouldn't be used anymore
         echo "Building for ${OS}/${ARCH} not supported."
     else

hack/build-all.bash

@@ -44,7 +44,7 @@ func (p *provider) UpdateKubeConfig(contextName string, serviceAccount *latest.S
 
 	authInfo := api.NewAuthInfo()
 	authInfo.Exec = &api.ExecConfig{
-		APIVersion: "client.authentication.k8s.io/v1alpha1",
+		APIVersion: "client.authentication.k8s.io/v1beta1",
 		Command:    kubeconfig.AuthCommand,
 		Args:       []string{"use", "space", "--provider", p.Name, "--space-id", strconv.Itoa(spaceID), "--get-token", "--silent"},
 	}

pkg/cloud/configure.go

@@ -43,7 +43,7 @@ func TestUpdateKubeConfig(t *testing.T) {
 				AuthInfos: map[string]*api.AuthInfo{
 					"contextParam": &api.AuthInfo{
 						Exec: &api.ExecConfig{
-							APIVersion: "client.authentication.k8s.io/v1alpha1",
+							APIVersion: "client.authentication.k8s.io/v1beta1",
 							Command:    "devspace",
 							Args:       []string{"use", "space", "--provider", "providerName", "--space-id", "2", "--get-token", "--silent"},
 						},

pkg/cloud/configure_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/devspace-cloud/devspace-cloud-plugin/pkg/cloud/token"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
+	"k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
 
 	"github.com/devspace-cloud/devspace/pkg/util/log"
 )
@@ -160,12 +160,12 @@ func (p *provider) resume(server, caCert, token, namespace string, spaceID int,
 func printToken(token string) error {
 	// Print token to stdout
 	expireTime := metav1.NewTime(time.Now().Add(time.Hour))
-	response := &v1alpha1.ExecCredential{
+	response := &v1beta1.ExecCredential{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "ExecCredential",
-			APIVersion: "client.authentication.k8s.io/v1alpha1",
+			APIVersion: "client.authentication.k8s.io/v1beta1",
 		},
-		Status: &v1alpha1.ExecCredentialStatus{
+		Status: &v1beta1.ExecCredentialStatus{
 			Token:               token,
 			ExpirationTimestamp: &expireTime,
 		},