Pass different ca for gateway & inCluster

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Jan 10, 2025 · 23f642c · 23f642c
1 parent 9d75517
commit 23f642c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/.config/api-rules/violation_exceptions.list b/.config/api-rules/violation_exceptions.list
@@ -49,13 +49,14 @@ API rule violation: list_type_missing,kmodules.xyz/offshoot-api/api/v1,PodSpec,V
 API rule violation: list_type_missing,kmodules.xyz/offshoot-api/api/v1,ServiceSpec,ExternalIPs
 API rule violation: list_type_missing,kmodules.xyz/offshoot-api/api/v1,ServiceSpec,LoadBalancerSourceRanges
 API rule violation: list_type_missing,kmodules.xyz/offshoot-api/api/v1,ServiceSpec,Ports
-API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,DatabaseConnectionSpec,CACert
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,DatabaseConnectionSpec,Databases
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,DatabaseConnectionSpec,Gateway
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,ElasticsearchNodesStatSpec,Roles
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,ElasticsearchNodesStatsSpec,Nodes
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,ElasticsearchSchemaOverviewSpec,Indices
+API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,GatewayConnection,CACert
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,GenericSchemaOverviewSpec,Databases
+API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,InClusterConnection,CACert
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,MariaDBQueriesSpec,Queries
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,MongoDBCollectionSpec,TotalSize
 API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ui/v1alpha1,MongoDBQueriesSpec,Queries

diff --git a/apis/ui/v1alpha1/database_connection_types.go b/apis/ui/v1alpha1/database_connection_types.go
@@ -61,7 +61,6 @@ type DatabaseConnectionSpec struct {
 	//
 	// And some language specific template strings. Like: Java, C#, Go, Python, Javascript, Ruby etc.
 	ConnectOptions map[string]string `json:"connectOptions,omitempty"`
-	CACert         []byte            `json:"caCert,omitempty"`
 }
 
 //type ConnectOption struct {
@@ -84,6 +83,7 @@ type DatabaseConnectionSpec struct {
 type GatewayConnection struct {
 	*ofst.Gateway `json:",inline"`
 	SecretRef     *kmapi.ObjectReference `json:"secretRef,omitempty"`
+	CACert        []byte                 `json:"caCert,omitempty"`
 }
 
 type InClusterConnection struct {
@@ -93,6 +93,7 @@ type InClusterConnection struct {
 	// Example: kubectl exec -it -n default service/mongo-test1  -c mongodb -- bash -c '<the actual command>'
 	Exec      string                 `json:"exec,omitempty"`
 	SecretRef *kmapi.ObjectReference `json:"secretRef,omitempty"`
+	CACert    []byte                 `json:"caCert,omitempty"`
 }
 
 // DatabaseConnectionList contains a list of DatabaseConnection

diff --git a/apis/ui/v1alpha1/openapi_generated.go b/apis/ui/v1alpha1/openapi_generated.go
diff --git a/apis/ui/v1alpha1/zz_generated.deepcopy.go b/apis/ui/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/ui.kubedb.com_databaseconnections.yaml b/crds/ui.kubedb.com_databaseconnections.yaml
@@ -26,9 +26,6 @@ spec:
             type: object
           spec:
             properties:
-              caCert:
-                format: byte
-                type: string
               connectOptions:
                 additionalProperties:
                   type: string
@@ -40,6 +37,9 @@ spec:
               gateway:
                 items:
                   properties:
+                    caCert:
+                      format: byte
+                      type: string
                     hostname:
                       type: string
                     ip:
@@ -128,6 +128,9 @@ spec:
                 type: array
               inCluster:
                 properties:
+                  caCert:
+                    format: byte
+                    type: string
                   exec:
                     type: string
                   host: