1. Fix add cluster issue

2. Update the mesh version synchronously(osm 1.3 & fsm 0.2.0)
flomesh-io · Jan 30, 2023 · e4d866f · e4d866f
1 parent dbac92d
commit e4d866f
Show file tree

Hide file tree

Showing 28 changed files with 9,942 additions and 9,056 deletions.
diff --git a/packages/gui/public/meshconfig.yaml b/packages/gui/public/meshconfig.yaml
@@ -12,7 +12,7 @@ osm:
     # -- Container image pull policy for control plane containers
     pullPolicy: IfNotPresent
     # -- Container image tag for control plane images
-    tag: "1.2.0"
+    tag: "1.3.0"
     # -- Image name defaults
     name:
       # -- osm-controller's image name
@@ -57,7 +57,7 @@ osm:
   sidecarDrivers:
     - sidecarName: pipy
       # -- Sidecar image for Linux workloads
-      sidecarImage: flomesh/pipy:0.70.0-2
+      sidecarImage: flomesh/pipy:0.90.0-18
       # -- Remote destination port on which the Discovery Service listens for new connections from Sidecars.
       proxyServerPort: 6060
     - sidecarName: envoy
@@ -69,8 +69,74 @@ osm:
       proxyServerPort: 15128
   # -- Curl image for control plane init container
   curlImage: curlimages/curl
-  # -- Pipy repo image for Pipy sidecar's proxy control plane container
-  pipyRepoImage: flomesh/pipy-repo:0.70.0-2
+
+  # -- Pipy RepoServer
+  repoServer:
+    # -- Image used for Pipy RepoServer
+    image: flomesh/pipy-repo:0.90.0-18
+    # -- if false , Pipy RepoServer is installed within osmController pod.
+    standalone: false
+    # -- ipaddr of host/service where Pipy RepoServer is installed
+    ipaddr: "127.0.0.1"
+    # -- codebase is the folder used by osmController.
+    codebase: ""
+
+  pluginChains:
+    inbound-tcp:
+      - plugin: modules/inbound-tls-termination
+        priority: 130
+        disable: false
+      - plugin: modules/inbound-tcp-routing
+        priority: 120
+        disable: false
+      - plugin: modules/inbound-tcp-load-balancing
+        priority: 110
+        disable: false
+      - plugin: modules/inbound-tcp-default
+        priority: 100
+        disable: false
+    inbound-http:
+      - plugin: modules/inbound-tls-termination
+        priority: 180
+      - plugin: modules/inbound-http-routing
+        priority: 170
+      - plugin: modules/inbound-metrics-http
+        priority: 160
+      - plugin: modules/inbound-tracing-http
+        priority: 150
+      - plugin: modules/inbound-logging-http
+        priority: 140
+      - plugin: modules/inbound-throttle-service
+        priority: 130
+      - plugin: modules/inbound-throttle-route
+        priority: 120
+      - plugin: modules/inbound-http-load-balancing
+        priority: 110
+      - plugin: modules/inbound-http-default
+        priority: 100
+    outbound-tcp:
+      - plugin: modules/outbound-tcp-routing
+        priority: 120
+      - plugin: modules/outbound-tcp-load-balancing
+        priority: 110
+      - plugin: modules/outbound-tcp-default
+        priority: 100
+    outbound-http:
+      - plugin: modules/outbound-http-routing
+        priority: 160
+      - plugin: modules/outbound-metrics-http
+        priority: 150
+      - plugin: modules/outbound-tracing-http
+        priority: 140
+      - plugin: modules/outbound-logging-http
+        priority: 130
+      - plugin: modules/outbound-circuit-breaker
+        priority: 120
+      - plugin: modules/outbound-http-load-balancing
+        priority: 110
+      - plugin: modules/outbound-http-default
+        priority: 100
+
   #
   # -- OSM controller parameters
   osmController:
@@ -272,6 +338,9 @@ osm:
   # -- Enable permissive traffic policy mode
   enablePermissiveTrafficPolicy: true
 
+  # -- Traffic interception mode in the mesh
+  trafficInterceptionMode: iptables
+
   # -- Enable egress in the mesh
   enableEgress: true
 
@@ -323,11 +392,15 @@ osm:
   # -- Proxy mode for the proxy sidecar. Acceptable values are ['Localhost', 'PodIP']
   localProxyMode: Localhost
 
+  # -- Local DNS Proxy improves the performance of your computer by caching the responses coming from your DNS servers
+  localDNSProxy:
+    enable: false
+
   # -- Sets the max data plane connections allowed for an instance of osm-controller, set to 0 to not enforce limits
   maxDataPlaneConnections: 0
 
   # -- Sets the resync interval for regular proxy broadcast updates, set to 0s to not enforce any resync
-  configResyncInterval: "0s"
+  configResyncInterval: "90s"
 
   # -- Controller log verbosity
   controllerLogLevel: info
@@ -356,6 +429,8 @@ osm:
     port: 9411
     # -- Tracing collector's API path where the spans will be sent to
     endpoint: "/api/v2/spans"
+    # -- Sampled Fraction
+    sampledFraction: "1.0"
     # -- Image used for tracing
     image: jaegertracing/all-in-one
 
@@ -402,6 +477,8 @@ osm:
     endpoint: ""
     # -- The authorization for remote logging service
     authorization: ""
+    # -- Sampled Fraction
+    sampledFraction: "1.0"
 
   # -- Specifies a global list of IP ranges to exclude from outbound traffic interception by the sidecar proxy.
   # If specified, must be a list of IP ranges of the form a.b.c.d/x.
@@ -499,7 +576,7 @@ osm:
   # -- Feature flags for experimental features
   featureFlags:
     # -- Enable extra Envoy statistics generated by a custom WASM extension
-    enableWASMStats: true
+    enableWASMStats: false
     # -- Enable OSM's Egress policy API.
     # When enabled, fine grained control over Egress (external) traffic is enforced
     enableEgressPolicy: true
@@ -519,6 +596,8 @@ osm:
     enableSnapshotCacheMode: false
     # -- Enable Retry Policy for automatic request retries
     enableRetryPolicy: false
+    # -- Enable Plugin Policy for extend
+    enablePluginPolicy: false
     # -- Enable the MeshRootCertificate to configure the OSM certificate provider
     enableMeshRootCertificate: false
 

diff --git a/packages/server/api/mesh/services/mesh.js b/packages/server/api/mesh/services/mesh.js
@@ -129,7 +129,7 @@ module.exports = {
     });
 
     if (result.mcsEnable) {
-      let helmFsmCmd = `helm repo add fsm https://charts.flomesh.io && helm install --namespace ${result.namespace.name} --kubeconfig ${kubeconfigPath} --set fsm.logLevel=5 --version=0.2.0-beta.3 fsm fsm/fsm --create-namespace`;
+      let helmFsmCmd = `helm repo add fsm https://charts.flomesh.io && helm install --namespace ${result.namespace.name} --kubeconfig ${kubeconfigPath} --set fsm.logLevel=5 --version=0.2.0 fsm fsm/fsm --create-namespace`;
 
       if (result.timeout) {
         helmFsmCmd += ' --timeout ${result.timeout}';
@@ -160,9 +160,6 @@ module.exports = {
             result.namespace.name
           );
           const name = "cluster" + registry.id;
-          const ca = registry.content.certificate;
-          const token = registry.content.credit;
-          const server = registry.address;
           const cluster = {
             apiVersion: 'flomesh.io/v1alpha1',
             kind: 'Cluster',
@@ -172,7 +169,7 @@ module.exports = {
             spec: {
               gatewayHost: res.body.status.loadBalancer.ingress[0].ip,
               gatewayPort: res.body.spec.ports[0].port,
-              kubeconfig: `apiVersion: v1\nclusters:\n- cluster:\n    certificate-authority-data: ${ca}\n    server: ${server}\n  name: fsm-${name}\ncontexts:\n- context:\n    cluster: fsm-${name}\n    user: admin@fsm-${name}\n  name: fsm-${name}\ncurrent-context: fsm-${name}\nkind: Config\npreferences: {}\nusers:\n- name: admin@fsm-${name}\n  user:\n    token: ${token}`,
+              kubeconfig: registry.config,
             },
           };
 

diff --git a/packages/server/charts/osm/Chart.lock b/packages/server/charts/osm/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 8.0.4
 - name: fsm
   repository: https://charts.flomesh.io
-  version: 0.1.7
-digest: sha256:e799592467e9b95fbd540922c1d388061da59be79fc7865244a864f72adfbf6b
-generated: "2022-09-17T10:20:22.129884+08:00"
+  version: 0.2.0
+digest: sha256:be8ced3d604a29b0ba0238a3e5ce023e0481f3a4dbedb72addaa49eed1d9c665
+generated: "2023-01-26T22:30:29.607702+08:00"
diff --git a/packages/server/charts/osm/Chart.yaml b/packages/server/charts/osm/Chart.yaml
@@ -14,11 +14,11 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.2.0
+version: 1.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v1.2.0
+appVersion: v1.3.0
 
 # This specifies the minimum Kubernetes version OSM is compatible with.
 kubeVersion: ">= 1.19.0-0"
@@ -29,6 +29,6 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   condition: contour.enabled
 - name: fsm
-  version: 0.1.7
+  version: 0.2.0
   repository: https://charts.flomesh.io
   condition: fsm.enabled