Merge branch 'develop' of https://github.com/mark4z/dubbo-go-pixiu in…

…to develop

licenses/github.com/MakeNowJust/heredoc/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 TSUYUSATO Kitsune
+Copyright (c) 2014-2019 TSUYUSATO Kitsune
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

licenses/github.com/blang/semver/v4/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2014 Benedikt Lang <github at benediktlang.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

licenses/github.com/shirou/gopsutil/v3/LICENSE

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -------
-internal/common/binary.go in the gopsutil is copied and modifid from golang/encoding/binary.go.
+internal/common/binary.go in the gopsutil is copied and modified from golang/encoding/binary.go.
 
 
 

licenses/github.com/tklauser/numcpus/LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -178,15 +179,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} Authors of Cilium
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

manifests/charts/base/files/gen-istio-cluster.yaml

@@ -118,66 +118,6 @@ spec:
     subresources:
       status: {}
 
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    "helm.sh/resource-policy": keep
-  labels:
-    app: istio-pilot
-    chart: istio
-    heritage: Tiller
-    release: istio
-  name: servicenamemappings.extensions.istio.io
-spec:
-  group: extensions.istio.io
-  names:
-    categories:
-    - istio-io
-    - extensions-istio-io
-    kind: ServiceNameMapping
-    listKind: ServiceNameMappingList
-    plural: servicenamemappings
-    shortNames:
-    - snp
-    singular: servicenamemapping
-  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:
-            description: 'it''s the spec of Service Name Mapping, which is used to
-              map the interface name See more details at:'
-            properties:
-              applicationNames:
-                items:
-                  type: string
-                type: array
-              interfaceName:
-                description: InterfaceName.
-                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
@@ -6967,7 +6907,7 @@ metadata:
     app: istiod
     release: istio
     istio: istiod
-    istio.io/rev: default
+    istio.io/rev: dubbo
 webhooks:
   - name: validation.istio.io
     clientConfig:

manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml

@@ -1510,6 +1510,15 @@ rules:
   - apiGroups: ["multicluster.x-k8s.io"]
     resources: ["serviceimports"]
     verbs: ["get", "watch", "list"]
+
+  # Used for Service Name Mapping
+  - apiGroups: ["extensions.istio.io"]
+    resources: ["servicenamemappings"]
+    verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
+  # Used for Service Metadata
+  - apiGroups: ["extensions.istio.io"]
+    resources: ["servicemetadatas"]
+    verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
 ---
 # Source: istiod/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1

manifests/charts/istio-control/istio-discovery/templates/clusterrole.yaml

@@ -124,6 +124,10 @@ rules:
   - apiGroups: ["extensions.istio.io"]
     resources: ["servicenamemappings"]
     verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
+  # Used for Service Metadata
+  - apiGroups: ["extensions.istio.io"]
+    resources: ["servicemetadatas"]
+    verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
 ---
 {{- if not (eq (toString .Values.pilot.env.PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER) "false") }}
 apiVersion: rbac.authorization.k8s.io/v1

manifests/charts/istiod-remote/templates/clusterrole.yaml

@@ -120,6 +120,15 @@ rules:
   - apiGroups: ["{{ $mcsAPIGroup }}"]
     resources: ["serviceimports"]
     verbs: ["get", "watch", "list"]
+
+  # Used for Service Name Mapping
+  - apiGroups: ["extensions.istio.io"]
+    resources: ["servicenamemappings"]
+    verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
+  # Used for Service Metadata
+  - apiGroups: ["extensions.istio.io"]
+    resources: ["servicemetadatas"]
+    verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ]
 ---
 {{- if not (eq (toString .Values.pilot.env.PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER) "false") }}
 apiVersion: rbac.authorization.k8s.io/v1

pixiu/pkg/pluginregistry/proxywasm_register.go

@@ -19,4 +19,6 @@
 
 package pluginregistry
 
-import _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/filter/http/proxywasm"
+import (
+	_ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/filter/http/proxywasm"
+)