broker CRD no longer directly embeds secrets, fix liqoctl path in installation.sh

AleC-IX · AleC-IX · commit 50bc9b761682 · 2025-04-22T15:50:11.000+02:00
diff --git a/apis/network/v1alpha1/broker_types.go b/apis/network/v1alpha1/broker_types.go
@@ -15,19 +15,18 @@
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // BrokerSpec defines the desired state of Broker.
 type BrokerSpec struct {
 
 	// Address of the Broker.
-	Address string         `json:"address"`
-	Name    string         `json:"name"`
-	ClCert  *corev1.Secret `json:"clcert"`
-	CaCert  *corev1.Secret `json:"cacert"`
-	Role    string         `json:"role"`
+	Address string `json:"address"`
+	Name    string `json:"name"`
+	ClCert  string `json:"clcert"`
+	CaCert  string `json:"cacert"`
+	Role    string `json:"role"`
 }
 
 // BrokerStatus defines the observed state of Broker.
diff --git a/apis/network/v1alpha1/zz_generated.deepcopy.go b/apis/network/v1alpha1/zz_generated.deepcopy.go
diff --git a/deployments/node/crds/network.fluidos.eu_brokers.yaml b/deployments/node/crds/network.fluidos.eu_brokers.yaml
@@ -46,153 +46,9 @@ spec:
                 description: Address of the Broker.
                 type: string
               cacert:
-                description: |-
-                  Secret holds secret data of a certain type. The total bytes of the values in
-                  the Data field must be less than MaxSecretSize bytes.
-                properties:
-                  apiVersion:
-                    description: |-
-                      APIVersion defines the versioned schema of this representation of an object.
-                      Servers should convert recognized schemas to the latest internal value, and
-                      may reject unrecognized values.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-                    type: string
-                  data:
-                    additionalProperties:
-                      format: byte
-                      type: string
-                    description: |-
-                      Data contains the secret data. Each key must consist of alphanumeric
-                      characters, '-', '_' or '.'. The serialized form of the secret data is a
-                      base64 encoded string, representing the arbitrary (possibly non-string)
-                      data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
-                    type: object
-                  immutable:
-                    description: |-
-                      Immutable, if set to true, ensures that data stored in the Secret cannot
-                      be updated (only object metadata can be modified).
-                      If not set to true, the field can be modified at any time.
-                      Defaulted to nil.
-                    type: boolean
-                  kind:
-                    description: |-
-                      Kind is a string value representing the REST resource this object represents.
-                      Servers may infer this from the endpoint the client submits requests to.
-                      Cannot be updated.
-                      In CamelCase.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-                    type: string
-                  metadata:
-                    description: |-
-                      Standard object's metadata.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-                    properties:
-                      annotations:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      finalizers:
-                        items:
-                          type: string
-                        type: array
-                      labels:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      name:
-                        type: string
-                      namespace:
-                        type: string
-                    type: object
-                  stringData:
-                    additionalProperties:
-                      type: string
-                    description: |-
-                      stringData allows specifying non-binary secret data in string form.
-                      It is provided as a write-only input field for convenience.
-                      All keys and values are merged into the data field on write, overwriting any existing values.
-                      The stringData field is never output when reading from the API.
-                    type: object
-                  type:
-                    description: |-
-                      Used to facilitate programmatic handling of secret data.
-                      More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
-                    type: string
-                type: object
+                type: string
               clcert:
-                description: |-
-                  Secret holds secret data of a certain type. The total bytes of the values in
-                  the Data field must be less than MaxSecretSize bytes.
-                properties:
-                  apiVersion:
-                    description: |-
-                      APIVersion defines the versioned schema of this representation of an object.
-                      Servers should convert recognized schemas to the latest internal value, and
-                      may reject unrecognized values.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-                    type: string
-                  data:
-                    additionalProperties:
-                      format: byte
-                      type: string
-                    description: |-
-                      Data contains the secret data. Each key must consist of alphanumeric
-                      characters, '-', '_' or '.'. The serialized form of the secret data is a
-                      base64 encoded string, representing the arbitrary (possibly non-string)
-                      data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
-                    type: object
-                  immutable:
-                    description: |-
-                      Immutable, if set to true, ensures that data stored in the Secret cannot
-                      be updated (only object metadata can be modified).
-                      If not set to true, the field can be modified at any time.
-                      Defaulted to nil.
-                    type: boolean
-                  kind:
-                    description: |-
-                      Kind is a string value representing the REST resource this object represents.
-                      Servers may infer this from the endpoint the client submits requests to.
-                      Cannot be updated.
-                      In CamelCase.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-                    type: string
-                  metadata:
-                    description: |-
-                      Standard object's metadata.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-                    properties:
-                      annotations:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      finalizers:
-                        items:
-                          type: string
-                        type: array
-                      labels:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      name:
-                        type: string
-                      namespace:
-                        type: string
-                    type: object
-                  stringData:
-                    additionalProperties:
-                      type: string
-                    description: |-
-                      stringData allows specifying non-binary secret data in string form.
-                      It is provided as a write-only input field for convenience.
-                      All keys and values are merged into the data field on write, overwriting any existing values.
-                      The stringData field is never output when reading from the API.
-                    type: object
-                  type:
-                    description: |-
-                      Used to facilitate programmatic handling of secret data.
-                      More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
-                    type: string
-                type: object
+                type: string
               name:
                 type: string
               role:
diff --git a/deployments/node/samples/broker.yaml b/deployments/node/samples/broker.yaml
@@ -12,15 +12,5 @@ spec:
   # anything else both publisher AND subscriber
   role: both
   #secrets must be created from certificate and key provided by broker server
-  cacert:
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: broker-ca-secret
-      namespace: fluidos
-  clcert:
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: broker-client-secret
-      namespace: fluidos
+  cacert: brokera-ca-xxxxx
+  clcert: brokera-cl-yyyyy
diff --git a/pkg/network-manager/broker_client.go b/pkg/network-manager/broker_client.go
@@ -116,15 +116,15 @@ func (bc *BrokerClient) SetupBrokerClient(cl client.Client, broker *networkv1alp
 	bc.clientCert = &corev1.Secret{}
 	bc.rootCert = &corev1.Secret{}
 
-	klog.Infof("Root Secret Name: %s\n", broker.Spec.CaCert.Name)
-	klog.Infof("Client Secret Name: %s\n", broker.Spec.ClCert.Name)
+	klog.Infof("Root Secret Name: %s\n", broker.Spec.CaCert)
+	klog.Infof("Client Secret Name: %s\n", broker.Spec.ClCert)
 	secretNamespace := "fluidos"
 
-	err = bc.extractSecret(cl, broker.Spec.ClCert.Name, secretNamespace, bc.clientCert)
+	err = bc.extractSecret(cl, broker.Spec.ClCert, secretNamespace, bc.clientCert)
 	if err != nil {
 		return err
 	}
-	err = bc.extractSecret(cl, broker.Spec.CaCert.Name, secretNamespace, bc.rootCert)
+	err = bc.extractSecret(cl, broker.Spec.CaCert, secretNamespace, bc.rootCert)
 	if err != nil {
 		return err
 	}
diff --git a/tools/scripts/broker-creation.sh b/tools/scripts/broker-creation.sh
@@ -55,18 +55,9 @@ spec:
   name: $broker_name
   address: $address
   role: $role
-  cacert:
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: $broker_ca_secret
-      namespace: fluidos
-  clcert:
-    apiVersion: v1
-    kind: Secret
-    metadata:
-      name: $broker_client_secret
-      namespace: fluidos
+  cacert: $broker_ca_secret
+  clcert: $broker_client_secret
+
 EOF
 
 if [ -f "$broker_name.yaml" ]; then
diff --git a/tools/scripts/installation.sh b/tools/scripts/installation.sh
@@ -146,7 +146,12 @@ function install_components() {
         echo "Cluster is: $cluster"
         echo "Cluster value is: ${clusters[$cluster]}"
 
-        liqoctl_path=$(alias liqoctl | sed -E "s/alias liqoctl='(.*)'/\1/")
+        if alias liqoctl &>/dev/null; then
+            liqoctl_path=$(alias liqoctl | sed -E "s/alias liqoctl='(.*)'/\1/")
+        else
+            liqoctl_path=$(which liqoctl)
+        fi
+        
         echo "Liqoctl version in installation.sh CLUSTER LOOP: $(liqoctl version 2>&1 | grep -oP 'Client version: \K\S+')"
         if [ -z "$liqoctl_path" ]; then
             liqoctl_path='/usr/local/bin/liqoctl'
