update klusterletconfig CRD (#308)

Signed-off-by: Yang Le <[email protected]>
stolostron · Feb 1, 2024 · afdf3c2 · afdf3c2
1 parent 9318a79
commit afdf3c2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/deploy/base/config.open-cluster-management.io_klusterletconfig.crd.yaml b/deploy/base/config.open-cluster-management.io_klusterletconfig.crd.yaml
@@ -45,12 +45,6 @@ spec:
                   ConfigMap in the cluster namespace;'
                 format: byte
                 type: string
-              hubKubeAPIServerEndpoint:
-                description: HubKubeAPIServerURL is the URL of the hub Kube API server.
-                  If not present, the .status.apiServerURL of Infrastructure/cluster
-                  will be used as the default value. e.g. `oc get infrastructure cluster
-                  -o jsonpath='{.status.apiServerURL}'`
-                type: string
               hubKubeAPIServerProxyConfig:
                 description: HubKubeAPIServerProxyConfig holds proxy settings for
                   connections between klusterlet/add-on agents on the managed cluster
@@ -73,6 +67,12 @@ spec:
                       set.
                     type: string
                 type: object
+              hubKubeAPIServerURL:
+                description: HubKubeAPIServerURL is the URL of the hub Kube API server.
+                  If not present, the .status.apiServerURL of Infrastructure/cluster
+                  will be used as the default value. e.g. `oc get infrastructure cluster
+                  -o jsonpath='{.status.apiServerURL}'`
+                type: string
               nodePlacement:
                 description: NodePlacement enables explicit control over the scheduling
                   of the agent components. If the placement is nil, the placement

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/openshift/hive/apis v0.0.0-20230825202726-4418e43e27a3
 	github.com/openshift/library-go v0.0.0-20230809121909-d7e7beca5bae // https://github.com/openshift/library-go/tree/release-4.14
 	github.com/spf13/pflag v1.0.5
-	github.com/stolostron/cluster-lifecycle-api v0.0.0-20240123023750-d71a6437fb00
+	github.com/stolostron/cluster-lifecycle-api v0.0.0-20240130112703-747158a63f05
 	go.uber.org/zap v1.26.0
 	golang.org/x/text v0.13.0
 	k8s.io/api v0.28.2

diff --git a/go.sum b/go.sum
@@ -386,8 +386,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stolostron/cluster-lifecycle-api v0.0.0-20240123023750-d71a6437fb00 h1:q0DY1qdDPYWVrPiEeAIgzZRVt5DUCKae5f3ihBsEwkE=
-github.com/stolostron/cluster-lifecycle-api v0.0.0-20240123023750-d71a6437fb00/go.mod h1:ZNQ3Rttgk4HEreCHfocrhXavLDaUgHbZaUqk5dP8/As=
+github.com/stolostron/cluster-lifecycle-api v0.0.0-20240130112703-747158a63f05 h1:6BHHHhtkG7dIvwF3zSWybvighvG4D4Eis0NSSBqey1E=
+github.com/stolostron/cluster-lifecycle-api v0.0.0-20240130112703-747158a63f05/go.mod h1:ZNQ3Rttgk4HEreCHfocrhXavLDaUgHbZaUqk5dP8/As=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=

diff --git a/test/e2e/klusterletconfig_test.go b/test/e2e/klusterletconfig_test.go
@@ -125,6 +125,8 @@ var _ = Describe("Use KlusterletConfig to customize klusterlet manifests", func(
 				},
 			},
 		)
+
+		assertManagedClusterAvailable(managedClusterName)
 	})
 
 	It("Should deploy the klusterlet with proxy config", func() {
-Original file line number
+Diff line change
@@ Expand Up @@
     				},
     			},
     		)
+    		assertManagedClusterAvailable(managedClusterName)
     	})
     	It("Should deploy the klusterlet with proxy config", func() {
@@ Expand Down @@