Support rust generic runtime (#688)

* Support rust generic runtime * Update webhook * Update runner image * Fix rust oauth2 * Fix vulnerability * Fix vulnerability * Remove unittest for go1.18 * Add default runner image for wasm
streamnative · Oct 23, 2023 · 606dc73 · 606dc73
1 parent da7ead5
commit 606dc73
Show file tree

Hide file tree

Showing 18 changed files with 369 additions and 27 deletions.
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.18, 1.19, 1.20.4]
+        go-version: [1.19, 1.20.4]
     steps:
       - name: clean disk
         run: |

diff --git a/api/compute/v1alpha1/common.go b/api/compute/v1alpha1/common.go
@@ -131,7 +131,7 @@ func (o *OAuth2Config) GetMountFile() string {
 }
 
 func (o *OAuth2Config) AuthenticationParameters() string {
-	return fmt.Sprintf(`'{"privateKey":"%s","private_key":"%s","issuerUrl":"%s","issuer_url":"%s","audience":"%s","scope":"%s"}'`, o.GetMountFile(), o.GetMountFile(), o.IssuerURL, o.IssuerURL, o.Audience, o.Scope)
+	return fmt.Sprintf(`'{"credentials_url":"file://%s","privateKey":"%s","private_key":"%s","issuerUrl":"%s","issuer_url":"%s","audience":"%s","scope":"%s"}'`, o.GetMountFile(), o.GetMountFile(), o.GetMountFile(), o.IssuerURL, o.IssuerURL, o.Audience, o.Scope)
 }
 
 type GenericAuth struct {
@@ -234,9 +234,10 @@ type PodPolicy struct {
 }
 
 type Runtime struct {
-	Java   *JavaRuntime   `json:"java,omitempty"`
-	Python *PythonRuntime `json:"python,omitempty"`
-	Golang *GoRuntime     `json:"golang,omitempty"`
+	Java           *JavaRuntime    `json:"java,omitempty"`
+	Python         *PythonRuntime  `json:"python,omitempty"`
+	Golang         *GoRuntime      `json:"golang,omitempty"`
+	GenericRuntime *GenericRuntime `json:"genericRuntime,omitempty"`
 }
 
 // JavaRuntime contains the java runtime configs
@@ -268,6 +269,16 @@ type GoRuntime struct {
 	Log        *RuntimeLogConfig `json:"log,omitempty"`
 }
 
+// GenericRuntime contains the generic runtime configs
+// +kubebuilder:validation:Optional
+type GenericRuntime struct {
+	// +kubebuilder:validation:Required
+	FunctionFile string `json:"functionFile"`
+	// +kubebuilder:validation:Required
+	Language             string `json:"language"`
+	FunctionFileLocation string `json:"functionFileLocation,omitempty"`
+}
+
 type SecretRef struct {
 	Path string `json:"path,omitempty"`
 	Key  string `json:"key,omitempty"`

diff --git a/api/compute/v1alpha1/zz_generated.deepcopy.go b/api/compute/v1alpha1/zz_generated.deepcopy.go
diff --git a/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml b/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml
@@ -50,6 +50,18 @@ spec:
                       funcConfig:
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
+                      genericRuntime:
+                        properties:
+                          functionFile:
+                            type: string
+                          functionFileLocation:
+                            type: string
+                          language:
+                            type: string
+                        required:
+                          - functionFile
+                          - language
+                        type: object
                       golang:
                         properties:
                           go:
@@ -3620,6 +3632,18 @@ spec:
                         type: string
                       filebeatImage:
                         type: string
+                      genericRuntime:
+                        properties:
+                          functionFile:
+                            type: string
+                          functionFileLocation:
+                            type: string
+                          language:
+                            type: string
+                        required:
+                          - functionFile
+                          - language
+                        type: object
                       golang:
                         properties:
                           go:
@@ -6937,6 +6961,18 @@ spec:
                         type: string
                       forwardSourceMessageProperty:
                         type: boolean
+                      genericRuntime:
+                        properties:
+                          functionFile:
+                            type: string
+                          functionFileLocation:
+                            type: string
+                          language:
+                            type: string
+                        required:
+                          - functionFile
+                          - language
+                        type: object
                       golang:
                         properties:
                           go:

diff --git a/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml b/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml
@@ -69,6 +69,18 @@ spec:
                 funcConfig:
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
+                genericRuntime:
+                  properties:
+                    functionFile:
+                      type: string
+                    functionFileLocation:
+                      type: string
+                    language:
+                      type: string
+                  required:
+                    - functionFile
+                    - language
+                  type: object
                 golang:
                   properties:
                     go:

diff --git a/...n-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml b/...n-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml
@@ -64,6 +64,18 @@ spec:
                   type: string
                 filebeatImage:
                   type: string
+                genericRuntime:
+                  properties:
+                    functionFile:
+                      type: string
+                    functionFileLocation:
+                      type: string
+                    language:
+                      type: string
+                  required:
+                    - functionFile
+                    - language
+                  type: object
                 golang:
                   properties:
                     go:

diff --git a/...mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml b/...mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml
@@ -70,6 +70,18 @@ spec:
                   type: string
                 forwardSourceMessageProperty:
                   type: boolean
+                genericRuntime:
+                  properties:
+                    functionFile:
+                      type: string
+                    functionFileLocation:
+                      type: string
+                    language:
+                      type: string
+                  required:
+                    - functionFile
+                    - language
+                  type: object
                 golang:
                   properties:
                     go:

diff --git a/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml b/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml
@@ -51,6 +51,18 @@ spec:
                     funcConfig:
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
+                    genericRuntime:
+                      properties:
+                        functionFile:
+                          type: string
+                        functionFileLocation:
+                          type: string
+                        language:
+                          type: string
+                      required:
+                      - functionFile
+                      - language
+                      type: object
                     golang:
                       properties:
                         go:
@@ -3621,6 +3633,18 @@ spec:
                       type: string
                     filebeatImage:
                       type: string
+                    genericRuntime:
+                      properties:
+                        functionFile:
+                          type: string
+                        functionFileLocation:
+                          type: string
+                        language:
+                          type: string
+                      required:
+                      - functionFile
+                      - language
+                      type: object
                     golang:
                       properties:
                         go:
@@ -6938,6 +6962,18 @@ spec:
                       type: string
                     forwardSourceMessageProperty:
                       type: boolean
+                    genericRuntime:
+                      properties:
+                        functionFile:
+                          type: string
+                        functionFileLocation:
+                          type: string
+                        language:
+                          type: string
+                      required:
+                      - functionFile
+                      - language
+                      type: object
                     golang:
                       properties:
                         go:

diff --git a/config/crd/bases/compute.functionmesh.io_functions.yaml b/config/crd/bases/compute.functionmesh.io_functions.yaml
@@ -48,6 +48,18 @@ spec:
               funcConfig:
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              genericRuntime:
+                properties:
+                  functionFile:
+                    type: string
+                  functionFileLocation:
+                    type: string
+                  language:
+                    type: string
+                required:
+                - functionFile
+                - language
+                type: object
               golang:
                 properties:
                   go:

diff --git a/config/crd/bases/compute.functionmesh.io_sinks.yaml b/config/crd/bases/compute.functionmesh.io_sinks.yaml
@@ -43,6 +43,18 @@ spec:
                 type: string
               filebeatImage:
                 type: string
+              genericRuntime:
+                properties:
+                  functionFile:
+                    type: string
+                  functionFileLocation:
+                    type: string
+                  language:
+                    type: string
+                required:
+                - functionFile
+                - language
+                type: object
               golang:
                 properties:
                   go:

diff --git a/config/crd/bases/compute.functionmesh.io_sources.yaml b/config/crd/bases/compute.functionmesh.io_sources.yaml
@@ -49,6 +49,18 @@ spec:
                 type: string
               forwardSourceMessageProperty:
                 type: boolean
+              genericRuntime:
+                properties:
+                  functionFile:
+                    type: string
+                  functionFileLocation:
+                    type: string
+                  language:
+                    type: string
+                required:
+                - functionFile
+                - language
+                type: object
               golang:
                 properties:
                   go: