revert config changes

Signed-off-by: Karol Szwaj <[email protected]>

On-behalf-of: @SAP [email protected]

Author: cnvergence

Makefile

@@ -235,10 +235,10 @@ verify-codegen: ## Verify codegen
 imports: WHAT ?=
 imports: $(GOLANGCI_LINT) verify-go-versions
 	@if [ -n "$(WHAT)" ]; then \
-	  $(GOLANGCI_LINT) run  --fix --fast-only $(WHAT); \
+	  $(GOLANGCI_LINT) run --fix --fast-only $(WHAT); \
 	else \
 	  for MOD in . $$(git ls-files '**/go.mod' | sed 's,/go.mod,,'); do \
-		(cd $$MOD; $(GOLANGCI_LINT) run  --fix --fast-only); \
+		(cd $$MOD; $(GOLANGCI_LINT) run --fix --fast-only); \
 	  done; \
 	fi
 

cli/pkg/workspace/plugin/create_test.go

@@ -184,13 +184,13 @@ func TestCreate(t *testing.T) {
 
 			var got *clientcmdapi.Config
 
-			cluster := tt.config.Clusters[tt.config.Contexts[tt.config.CurrentContext].Cluster]
+			cluster := tt.config.Clusters[tt.config.Contexts[tt.config.CurrentContext].Cluster] //nolint:govet // TODO(sttts): fixing this above breaks the test
 			u := parseURLOrDie(cluster.Server)
 			currentClusterName := logicalcluster.NewPath(strings.TrimPrefix(u.Path, "/clusters/"))
 			u.Path = ""
 
 			objects := []runtime.Object{}
-			for _, name := range tt.existingWorkspaces {
+			for _, name := range tt.existingWorkspaces { //nolint:govet // TODO(sttts): fixing this above breaks the test
 				objects = append(objects, &tenancyv1alpha1.Workspace{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: name,
@@ -217,7 +217,7 @@ func TestCreate(t *testing.T) {
 				}
 			}
 
-			if tt.markReady {
+			if tt.markReady { //nolint:govet // TODO(sttts): fixing this above breaks the test
 				client.PrependReactor("create", "workspaces", func(action kcptesting.Action) (handled bool, ret runtime.Object, err error) {
 					obj := action.(kcptesting.CreateAction).GetObject().(*tenancyv1alpha1.Workspace)
 					obj.Status.Phase = corev1alpha1.LogicalClusterPhaseReady
@@ -233,30 +233,30 @@ func TestCreate(t *testing.T) {
 			}
 
 			opts := NewCreateWorkspaceOptions(genericclioptions.NewTestIOStreamsDiscard())
-			opts.Name = tt.newWorkspaceName
+			opts.Name = tt.newWorkspaceName //nolint:govet // TODO(sttts): fixing this above breaks the test
 			opts.Type = workspaceType.Path + ":" + string(workspaceType.Name)
-			opts.IgnoreExisting = tt.ignoreExisting
-			opts.EnterAfterCreate = tt.useAfterCreation
+			opts.IgnoreExisting = tt.ignoreExisting     //nolint:govet // TODO(sttts): fixing this above breaks the test
+			opts.EnterAfterCreate = tt.useAfterCreation //nolint:govet // TODO(sttts): fixing this above breaks the test
 			opts.ReadyWaitTimeout = time.Second
 			opts.modifyConfig = func(configAccess clientcmd.ConfigAccess, config *clientcmdapi.Config) error {
 				got = config
 				return nil
 			}
 			opts.kcpClusterClient = client
-			opts.ClientConfig = clientcmd.NewDefaultClientConfig(*tt.config.DeepCopy(), nil)
+			opts.ClientConfig = clientcmd.NewDefaultClientConfig(*tt.config.DeepCopy(), nil) //nolint:govet // TODO(sttts): fixing this above breaks the test
 			err := opts.Run(context.Background())
-			if tt.wantErr {
+			if tt.wantErr { //nolint:govet // TODO(sttts): fixing this above breaks the test
 				require.Error(t, err)
 			} else {
 				require.NoError(t, err)
 			}
 
-			if got != nil && tt.expected == nil {
+			if got != nil && tt.expected == nil { //nolint:govet // TODO(sttts): fixing this above breaks the test
 				t.Errorf("unexpected kubeconfig write")
-			} else if got == nil && tt.expected != nil {
+			} else if got == nil && tt.expected != nil { //nolint:govet // TODO(sttts): fixing this above breaks the test
 				t.Errorf("expected a kubeconfig write, but didn't see one")
-			} else if got != nil && !reflect.DeepEqual(got, tt.expected) {
-				t.Errorf("unexpected config, diff (expected, got): %s", cmp.Diff(tt.expected, got))
+			} else if got != nil && !reflect.DeepEqual(got, tt.expected) { //nolint:govet // TODO(sttts): fixing this above breaks the test
+				t.Errorf("unexpected config, diff (expected, got): %s", cmp.Diff(tt.expected, got)) //nolint:govet // TODO(sttts): fixing this above breaks the test
 			}
 		})
 	}

config/root-phase0/apiexport-shards.core.kcp.io.yaml

@@ -1,9 +1,13 @@
-apiVersion: apis.kcp.io/v1alpha1
+apiVersion: apis.kcp.io/v1alpha2
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: shards.core.kcp.io
 spec:
-  latestResourceSchemas:
-  - v240903-d6797056a.shards.core.kcp.io
+  resources:
+  - group: core.kcp.io
+    name: shards
+    schema: v240903-d6797056a.shards.core.kcp.io
+    storage:
+      crd: {}
 status: {}

config/root-phase0/apiexport-tenancy.kcp.io.yaml

@@ -1,12 +1,20 @@
-apiVersion: apis.kcp.io/v1alpha1
+apiVersion: apis.kcp.io/v1alpha2
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: tenancy.kcp.io
 spec:
-  latestResourceSchemas:
-  - v250325-c1864de17.workspacetypes.tenancy.kcp.io
-  - v250421-25d98218b.workspaces.tenancy.kcp.io
   maximalPermissionPolicy:
     local: {}
+  resources:
+  - group: tenancy.kcp.io
+    name: workspaces
+    schema: v250421-25d98218b.workspaces.tenancy.kcp.io
+    storage:
+      crd: {}
+  - group: tenancy.kcp.io
+    name: workspacetypes
+    schema: v250325-c1864de17.workspacetypes.tenancy.kcp.io
+    storage:
+      crd: {}
 status: {}

config/root-phase0/apiexport-topology.kcp.io.yaml

@@ -1,10 +1,18 @@
-apiVersion: apis.kcp.io/v1alpha1
+apiVersion: apis.kcp.io/v1alpha2
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: topology.kcp.io
 spec:
-  latestResourceSchemas:
-  - v240903-d6797056a.partitions.topology.kcp.io
-  - v240903-d6797056a.partitionsets.topology.kcp.io
+  resources:
+  - group: topology.kcp.io
+    name: partitions
+    schema: v240903-d6797056a.partitions.topology.kcp.io
+    storage:
+      crd: {}
+  - group: topology.kcp.io
+    name: partitionsets
+    schema: v240903-d6797056a.partitionsets.topology.kcp.io
+    storage:
+      crd: {}
 status: {}