Add sample for BootstrapKubeconfig API type

vmware-tanzu · Jun 21, 2022 · a524548 · a524548
1 parent 9d33248
commit a524548
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/apis/infrastructure/v1beta1/bootstrapkubeconfig_types.go b/apis/infrastructure/v1beta1/bootstrapkubeconfig_types.go
@@ -38,7 +38,7 @@ type BootstrapKubeconfigSpec struct {
 	InsecureSkipTLSVerify bool `json:"insecure-skip-tls-verify,omitempty"`
 
 	// CertificateAuthorityData contains PEM-encoded certificate authority certificates.
-	CertificateAuthorityData string `json:"certificate-authority-data,omitempty"`
+	CertificateAuthorityData string `json:"certificate-authority-data"`
 }
 
 // BootstrapKubeconfigStatus defines the observed state of BootstrapKubeconfig

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_bootstrapkubeconfigs.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_bootstrapkubeconfigs.yaml
@@ -51,6 +51,7 @@ spec:
                 type: boolean
             required:
             - apiserver
+            - certificate-authority-data
             type: object
           status:
             description: BootstrapKubeconfigStatus defines the observed state of BootstrapKubeconfig

diff --git a/config/samples/infrastructure_v1beta1_bootstrapkubeconfig.yaml b/config/samples/infrastructure_v1beta1_bootstrapkubeconfig.yaml
@@ -3,4 +3,6 @@ kind: BootstrapKubeconfig
 metadata:
   name: bootstrapkubeconfig-sample
 spec:
-  # TODO(user): Add fields here
+  apiserver: https://<host>:<port>
+  insecure-skip-tls-verify: true
+  certificate-authority-data: PEM encoded CA Data
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -282,9 +282,10 @@ func generateBootstrapKubeconfig(ctx context.Context, clusterProxy framework.Clu
 
 	server := config.Clusters[name].Server
 	caData := b64.StdEncoding.EncodeToString(config.Clusters[name].CertificateAuthorityData)
+	skipTLS := config.Clusters[name].InsecureSkipTLSVerify
 	bootstrapKubeconfigCRD := builder.BootstrapKubeconfig("default", "test-config").
 		WithServer(server).
-		WithSkipTLSVerify(true).
+		WithSkipTLSVerify(skipTLS).
 		WithCAData(caData).
 		Build()
 	Expect(clusterProxy.GetClient().Create(context.TODO(), bootstrapKubeconfigCRD)).NotTo(HaveOccurred(), "failed to create test BootstrapKubeconfig CRD")