update auth and tls settings (#160)

* update auth and tls settings

Co-authored-by: guangning <guangning@apache.org>

Author: nlu90

api/v1alpha1/common.go

@@ -31,7 +31,18 @@ type PulsarMessaging struct {
 	// webServiceURL
 	// brokerServiceURL
 	PulsarConfig string `json:"pulsarConfig,omitempty"`
-	AuthConfig   string `json:"authConfig,omitempty"`
+
+	// The auth secret should contain the following fields
+	// clientAuthenticationPlugin
+	// clientAuthenticationParameters
+	AuthSecret string `json:"authSecret,omitempty"`
+
+	// The TLS secret should contain the following fields
+	// use_tls
+	// tls_allow_insecure
+	// hostname_verification_enabled
+	// tls_trust_cert_path
+	TLSSecret string `json:"tlsSecret,omitempty"`
 }
 
 type PodPolicy struct {

config/crd/bases/compute.functionmesh.io_functionmeshes.yaml

@@ -2192,10 +2192,12 @@ spec:
                     type: string
                   pulsar:
                     properties:
-                      authConfig:
+                      authSecret:
                         type: string
                       pulsarConfig:
                         type: string
+                      tlsSecret:
+                        type: string
                     type: object
                   python:
                     properties:
@@ -4363,10 +4365,12 @@ spec:
                     type: string
                   pulsar:
                     properties:
-                      authConfig:
+                      authSecret:
                         type: string
                       pulsarConfig:
                         type: string
+                      tlsSecret:
+                        type: string
                     type: object
                   python:
                     properties:
@@ -6513,10 +6517,12 @@ spec:
                     type: string
                   pulsar:
                     properties:
-                      authConfig:
+                      authSecret:
                         type: string
                       pulsarConfig:
                         type: string
+                      tlsSecret:
+                        type: string
                     type: object
                   python:
                     properties:

config/crd/bases/compute.functionmesh.io_functions.yaml

@@ -2193,10 +2193,12 @@ spec:
               type: string
             pulsar:
               properties:
-                authConfig:
+                authSecret:
                   type: string
                 pulsarConfig:
                   type: string
+                tlsSecret:
+                  type: string
               type: object
             python:
               properties:

config/crd/bases/compute.functionmesh.io_sinks.yaml

@@ -2128,10 +2128,12 @@ spec:
               type: string
             pulsar:
               properties:
-                authConfig:
+                authSecret:
                   type: string
                 pulsarConfig:
                   type: string
+                tlsSecret:
+                  type: string
               type: object
             python:
               properties:

config/crd/bases/compute.functionmesh.io_sources.yaml

@@ -2103,10 +2103,12 @@ spec:
               type: string
             pulsar:
               properties:
-                authConfig:
+                authSecret:
                   type: string
                 pulsarConfig:
                   type: string
+                tlsSecret:
+                  type: string
               type: object
             python:
               properties:

config/samples/compute_v1alpha1_function.yaml

@@ -34,7 +34,8 @@ spec:
         key: "password"
   pulsar:
     pulsarConfig: "test-pulsar"
-    #authConfig: "test-auth"
+    authSecret: "test-auth"
+    tlsSecret: "test-tls"
   volumeMounts:
     - mountPath: /cache
       name: cache-volume
@@ -73,6 +74,23 @@ metadata:
 data:
     webServiceURL: http://test-pulsar-broker.default.svc.cluster.local:8080
     brokerServiceURL: pulsar://test-pulsar-broker.default.svc.cluster.local:6650
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-auth
+stringData:
+  clientAuthenticationPlugin: admin
+  clientAuthenticationParameters: t0p-Secret
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-tls
+stringData:
+  tlsTrustCertsFilePath: "uvw"
+  tlsAllowInsecureConnection: "false"
+  tlsHostnameVerificationEnable: "true"
 #---
 #apiVersion: v1
 #kind: ConfigMap

config/samples/compute_v1alpha1_function_crypto.yaml

@@ -51,7 +51,6 @@ spec:
       key: "password"
   pulsar:
     pulsarConfig: "test-pulsar"
-    #authConfig: "test-auth"
   java:
     jar: pulsar-functions-api-examples.jar
     jarLocation: public/default/nlu-test-java-function
@@ -66,18 +65,6 @@ metadata:
 data:
   webServiceURL: http://test-pulsar-broker.default.svc.cluster.local:8080
   brokerServiceURL: pulsar://test-pulsar-broker.default.svc.cluster.local:6650
-#---
-#apiVersion: v1
-#kind: ConfigMap
-#metadata:
-#  name: test-auth
-#data:
-#  clientAuthenticationPlugin: "abc"
-#  clientAuthenticationParameters: "xyz"
-#  tlsTrustCertsFilePath: "uvw"
-#  useTls: "true"
-#  tlsAllowInsecureConnection: "false"
-#  tlsHostnameVerificationEnable: "true"
 ---
 apiVersion: v1
 data:

config/samples/compute_v1alpha1_function_key_based_batcher.yaml

@@ -37,7 +37,6 @@ spec:
       key: "password"
   pulsar:
     pulsarConfig: "test-pulsar"
-    #authConfig: "test-auth"
   volumeMounts:
     - mountPath: /cache
       name: cache-volume
@@ -75,18 +74,6 @@ metadata:
 data:
   webServiceURL: http://test-pulsar-broker.default.svc.cluster.local:8080
   brokerServiceURL: pulsar://test-pulsar-broker.default.svc.cluster.local:6650
-#---
-#apiVersion: v1
-#kind: ConfigMap
-#metadata:
-#  name: test-auth
-#data:
-#  clientAuthenticationPlugin: "abc"
-#  clientAuthenticationParameters: "xyz"
-#  tlsTrustCertsFilePath: "uvw"
-#  useTls: "true"
-#  tlsAllowInsecureConnection: "false"
-#  tlsHostnameVerificationEnable: "true"
 ---
 apiVersion: v1
 data:

config/samples/compute_v1alpha1_go_function.yaml

@@ -31,7 +31,6 @@ spec:
         key: "password"
   pulsar:
     pulsarConfig: "test-go-pulsar"
-    #authConfig: "test-auth"
   golang:
     go: go_func_all
     goLocation: public/default/nlu-test-go-function
@@ -48,18 +47,6 @@ metadata:
 data:
     webServiceURL: http://test-pulsar-broker.default.svc.cluster.local:8080
     brokerServiceURL: pulsar://test-pulsar-broker.default.svc.cluster.local:6650
-#---
-#apiVersion: v1
-#kind: ConfigMap
-#metadata:
-#  name: test-auth
-#data:
-#  clientAuthenticationPlugin: "abc"
-#  clientAuthenticationParameters: "xyz"
-#  tlsTrustCertsFilePath: "uvw"
-#  useTls: "true"
-#  tlsAllowInsecureConnection: "false"
-#  tlsHostnameVerificationEnable: "true"
 ---
 apiVersion: v1
 data:

config/samples/compute_v1alpha1_py_function.yaml

@@ -32,7 +32,6 @@ spec:
         key: "password"
   pulsar:
     pulsarConfig: "test-py-pulsar"
-    #authConfig: "test-auth"
   python:
     py: exclamation_function.py
     pyLocation: public/default/nlu-test-py-function
@@ -49,18 +48,6 @@ metadata:
 data:
     webServiceURL: http://test-pulsar-broker.default.svc.cluster.local:8080
     brokerServiceURL: pulsar://test-pulsar-broker.default.svc.cluster.local:6650
-#---
-#apiVersion: v1
-#kind: ConfigMap
-#metadata:
-#  name: test-auth
-#data:
-#  clientAuthenticationPlugin: "abc"
-#  clientAuthenticationParameters: "xyz"
-#  tlsTrustCertsFilePath: "uvw"
-#  useTls: "true"
-#  tlsAllowInsecureConnection: "false"
-#  tlsHostnameVerificationEnable: "true"
 ---
 apiVersion: v1
 data: