Support wasm api (#129)

2026-06-08 12:17:28 +08:00 · 2023-01-18 14:56:51 +08:00
parent 2133c273e9
commit d40a7c1f34
54 changed files with 3161 additions and 99 deletions
--- a/helm/higress/Chart.yaml
+++ b/helm/higress/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.5.3
+appVersion: 0.5.4
 description: Helm chart for deploying higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 keywords:
@@ -9,4 +9,4 @@ name: higress
 sources:
 - http://github.com/alibaba/higress
 type: application
-version: 0.5.3
+version: 0.5.4
--- a/helm/higress/crds/customresourcedefinitions.gen.yaml
+++ b/helm/higress/crds/customresourcedefinitions.gen.yaml
@@ -1,6 +1,108 @@
 # DO NOT EDIT - Generated by Cue OpenAPI generator based on Istio APIs.
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
+metadata:
+  annotations:
+    "helm.sh/resource-policy": keep
+  name: wasmplugins.extensions.higress.io
+spec:
+  group: extensions.higress.io
+  names:
+    categories:
+    - higress-io
+    - extensions-higress-io
+    kind: WasmPlugin
+    listKind: WasmPluginList
+    plural: wasmplugins
+    singular: wasmplugin
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: 'CreationTimestamp is a timestamp representing the server time
+        when this object was created. It is not guaranteed to be set in happens-before
+        order across separate operations. Clients may not set this value. It is represented
+        in RFC3339 form and is in UTC. Populated by the system. Read-only. Null for
+        lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata'
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              defaultConfig:
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
+              imagePullPolicy:
+                description: The pull behaviour to be applied when fetching an OCI
+                  image.
+                enum:
+                - UNSPECIFIED_POLICY
+                - IfNotPresent
+                - Always
+                type: string
+              imagePullSecret:
+                description: Credentials to use for OCI image pulling.
+                type: string
+              matchRules:
+                items:
+                  properties:
+                    config:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    domain:
+                      items:
+                        type: string
+                      type: array
+                    ingress:
+                      items:
+                        type: string
+                      type: array
+                  type: object
+                type: array
+              phase:
+                description: Determines where in the filter chain this `WasmPlugin`
+                  is to be injected.
+                enum:
+                - UNSPECIFIED_PHASE
+                - AUTHN
+                - AUTHZ
+                - STATS
+                type: string
+              pluginConfig:
+                description: The configuration that will be passed on to the plugin.
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
+              pluginName:
+                type: string
+              priority:
+                description: Determines ordering of `WasmPlugins` in the same `phase`.
+                nullable: true
+                type: integer
+              sha256:
+                description: SHA256 checksum that will be used to verify Wasm module
+                  or OCI container.
+                type: string
+              url:
+                description: URL of a Wasm module or OCI container.
+                type: string
+              verificationKey:
+                type: string
+            type: object
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
  annotations:
    "helm.sh/resource-policy": keep
--- a/helm/higress/templates/controller-clusterrole.yaml
+++ b/helm/higress/templates/controller-clusterrole.yaml
@@ -42,6 +42,10 @@ rules:
    resources: ["mcpbridges"]
    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]

+  - apiGroups: ["extensions.higress.io"]
+    resources: ["wasmplugins"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+
  - apiGroups: [""]
    resources: ["services"]
    verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
--- a/helm/higress/templates/global-gateway.yaml
+++ b/helm/higress/templates/global-gateway.yaml
@@ -1,17 +0,0 @@
-apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
-metadata:
-  name: global
-  namespace: {{ .Release.Namespace }}
-spec:
-  selector:
-    higress: {{ .Release.Namespace }}-{{ include "gateway.name" . }}
-  servers:
-    - hosts:
-        - "*"
-      port:
-        name: http-80
-        number: 80
-        protocol: HTTP
-
---
--- a/helm/higress/values.yaml
+++ b/helm/higress/values.yaml
@@ -14,7 +14,7 @@ gateway:
  name: "higress-gateway"
  replicas: 2
  image: gateway
-  tag: "bf607ae5541ce5c1cc95b4f98b3fd50a83346d33"
+  tag: "0.5.4"
  # revision declares which revision this gateway is a part of
  revision: ""

@@ -110,7 +110,7 @@ controller:
  name: "higress-controller"
  replicas: 1
  image: higress
-  tag: "bf607ae5541ce5c1cc95b4f98b3fd50a83346d33"
+  tag: "0.5.4"
  env: {}

  labels: {}
--- a/helm/istio/Chart.yaml
+++ b/helm/istio/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.12.3
+appVersion: 1.12.4
 description: Helm chart for deploying higress istio
 name: istio
 sources:
@@ -12,4 +12,4 @@ dependencies:
  repository: "file://../istiod"
  version: 1.12.0
 type: application
-version: 1.12.3
+version: 1.12.4
--- a/helm/istiod/values.yaml
+++ b/helm/istiod/values.yaml
@@ -10,7 +10,7 @@ pilot:
  rollingMaxUnavailable: 25%

  hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  tag: bf607ae5541ce5c1cc95b4f98b3fd50a83346d33
+  tag: 0.5.4

  # Can be a full hub/image:tag
  image: pilot
@@ -256,7 +256,7 @@ global:
  # Dev builds from prow are on gcr.io
  hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
  # Default tag for Istio images.
-  tag: bf607ae5541ce5c1cc95b4f98b3fd50a83346d33
+  tag: 0.5.4

  # Specify image pull policy if default behavior isn't desired.
  # Default behavior: latest images will be Always else IfNotPresent.
--- a/helm/kind/higress/Chart.lock
+++ b/helm/kind/higress/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: higress
  repository: file://../../higress
-  version: 0.5.3
-digest: sha256:31fd001a558b73f3a5b86d607ccf2c4ff7f206fc232068cfc6722ccd02081031
-generated: "2022-12-16T17:21:23.630507+08:00"
+  version: 0.5.4
+digest: sha256:ea2475e2ba790a07811de045f03ae1a2279a6596bcaa750109f149e8ae2c61bd
+generated: "2023-01-18T10:57:50.379427+08:00"
--- a/helm/kind/higress/Chart.yaml
+++ b/helm/kind/higress/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.5.3
+appVersion: 0.5.4
 description: Helm chart for deploying higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 keywords:
@@ -11,6 +11,6 @@ sources:
 dependencies:
 - name: higress
  repository: "file://../../higress"
-  version: 0.5.3
+  version: 0.5.4
 type: application
-version: 0.5.3
+version: 0.5.4
--- a/helm/kind/istio/Chart.yaml
+++ b/helm/kind/istio/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.12.3
+appVersion: 1.12.4
 description: Helm chart for deploying higress istio
 name: istio-local
 sources:
@@ -12,4 +12,4 @@ dependencies:
  repository: "file://../../istiod"
  version: 1.12.0
 type: application
-version: 1.12.3
+version: 1.12.4