[v2.9] Bump dependencies (#377)

* Bump bci image to 15.6
* Bump rancher api and client-go packages
* Remove PodSecurityPolicy references
* Bump rancher to v2.9 head

cliclient/cliclient.go

@@ -9,7 +9,7 @@ import (
 	"github.com/rancher/cli/config"
 	"github.com/rancher/norman/clientbase"
 	ntypes "github.com/rancher/norman/types"
-	capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1alpha4"
+	capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
 	clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3"
 	managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
 	projectClient "github.com/rancher/rancher/pkg/client/generated/project/v3"

cmd/cluster.go

@@ -85,10 +85,6 @@ func ClusterCommand() cli.Command {
 						Usage: "Network provider for the cluster (flannel, canal, calico)",
 						Value: "canal",
 					},
-					cli.StringFlag{
-						Name:  "psp-default-policy",
-						Usage: "Default pod security policy to apply",
-					},
 					cli.StringFlag{
 						Name:  "rke-config",
 						Usage: "Location of an rke config file to import. Can be JSON or YAML format",
@@ -815,17 +811,5 @@ func getClusterConfig(ctx *cli.Context) (*managementClient.Cluster, error) {
 		}
 	}
 
-	if ctx.String("psp-default-policy") != "" {
-		config.DefaultPodSecurityPolicyTemplateID = ctx.String("psp-default-policy")
-
-		if config.RancherKubernetesEngineConfig != nil {
-			config.RancherKubernetesEngineConfig.Services = &managementClient.RKEConfigServices{
-				KubeAPI: &managementClient.KubeAPIService{
-					PodSecurityPolicy: true,
-				},
-			}
-		}
-	}
-
 	return &config, nil
 }

cmd/machine.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/rancher/cli/cliclient"
-	capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1alpha4"
+	capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
 	"github.com/urfave/cli"
 )
 

go.mod

@@ -1,26 +1,28 @@
 module github.com/rancher/cli
 
-go 1.22
+go 1.22.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.28.8
+toolchain go1.22.5
+
+replace k8s.io/client-go => k8s.io/client-go v0.30.1
 
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
 	github.com/hashicorp/go-version v1.2.1
 	github.com/pkg/errors v0.9.1
-	github.com/rancher/norman v0.0.0-20240410185903-a9e04c653a51
-	github.com/rancher/rancher/pkg/apis v0.0.0-20240412123131-3b35c3b5da1f
-	github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473
+	github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9
+	github.com/rancher/rancher/pkg/apis v0.0.0-20240717211851-7df10c297f33
+	github.com/rancher/rancher/pkg/client v0.0.0-20240717211851-7df10c297f33
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/tidwall/gjson v1.17.0
 	github.com/urfave/cli v1.22.5
 	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
-	golang.org/x/oauth2 v0.16.0
+	golang.org/x/oauth2 v0.21.0
 	golang.org/x/sync v0.7.0
-	golang.org/x/term v0.19.0
-	golang.org/x/text v0.14.0
+	golang.org/x/term v0.22.0
+	golang.org/x/text v0.16.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/client-go v12.0.0+incompatible
@@ -31,9 +33,9 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
@@ -42,7 +44,7 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -58,36 +60,34 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/rancher/aks-operator v1.3.0-rc5 // indirect
-	github.com/rancher/eks-operator v1.4.0-rc5 // indirect
-	github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79 // indirect
-	github.com/rancher/gke-operator v1.3.0-rc6 // indirect
-	github.com/rancher/lasso v0.0.0-20240325194215-0064abcb8aee // indirect
-	github.com/rancher/rke v1.5.3 // indirect
-	github.com/rancher/wrangler v1.1.1 // indirect
-	github.com/rancher/wrangler/v2 v2.2.0-rc3 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rancher/aks-operator v1.9.0-rc.9 // indirect
+	github.com/rancher/eks-operator v1.9.0-rc.11 // indirect
+	github.com/rancher/fleet/pkg/apis v0.10.0 // indirect
+	github.com/rancher/gke-operator v1.9.0-rc.8 // indirect
+	github.com/rancher/lasso v0.0.0-20240705194423-b2a060d103c1 // indirect
+	github.com/rancher/rke v1.6.0-rc9 // indirect
+	github.com/rancher/wrangler/v3 v3.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.8 // indirect
-	k8s.io/apimachinery v0.28.8 // indirect
-	k8s.io/apiserver v0.28.6 // indirect
-	k8s.io/component-base v0.28.6 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/kubernetes v1.27.9 // indirect
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+	k8s.io/api v0.30.2 // indirect
+	k8s.io/apimachinery v0.30.2 // indirect
+	k8s.io/apiserver v0.30.1 // indirect
+	k8s.io/component-base v0.30.1 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/kubernetes v1.30.1 // indirect
+	k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
 	sigs.k8s.io/cli-utils v0.35.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )