update v1 crds and bundle-hango

install/init/crds-v1.yaml

@@ -309,7 +309,7 @@ spec:
  items:
  type: string
  type: array
- plugins:
+ plugin:
  items:
  oneOf:
  - not:
@@ -355,7 +355,7 @@ spec:
  description: Unordered map of dynamically typed values.
  type: object
  type: object
- type_url:
+ typeUrl:
  type: string
  rider:
  type: object
@@ -426,7 +426,7 @@ spec:
  type: string
  type: object
  type: array
- workload_selector:
+ workloadLabels:
  description: '`WorkloadSelector` specifies the criteria used to determine
  if the `Gateway`, `Sidecar`, or `EnvoyFilter` or `ServiceEntry` configuration
  can be applied to a proxy. The matching criteria includes the metadata
@@ -435,15 +435,8 @@ spec:
  the initial handshake. If multiple conditions are specified, all conditions
  need to match in order for the workload instance to be selected. Currently,
  only label based selection mechanism is supported.'
- properties:
- labels:
- additionalProperties:
- type: string
- description: One or more labels that indicate a specific set of pods/VMs
- on which the configuration should be applied. The scope of label
- search is restricted to the configuration namespace in which the
- the resource is present.
- type: object
+ additionalProperties:
+ type: string
  type: object
  status:
  type: object
@@ -565,7 +558,7 @@ spec:
  description: Unordered map of dynamically typed values.
  type: object
  type: object
- type_url:
+ typeUrl:
  type: string
  rider:
  type: object
@@ -651,7 +644,7 @@ spec:
  items:
  type: string
  type: array
- workload_selector:
+ workloadSelector:
  description: '`WorkloadSelector` specifies the criteria used to determine
  if the `Gateway`, `Sidecar`, or `EnvoyFilter` or `ServiceEntry` configuration
  can be applied to a proxy. The matching criteria includes the metadata
@@ -660,15 +653,8 @@ spec:
  the initial handshake. If multiple conditions are specified, all conditions
  need to match in order for the workload instance to be selected. Currently,
  only label based selection mechanism is supported.'
- properties:
- labels:
- additionalProperties:
- type: string
- description: One or more labels that indicate a specific set of pods/VMs
- on which the configuration should be applied. The scope of label
- search is restricted to the configuration namespace in which the
- the resource is present.
- type: object
+ additionalProperties:
+ type: string
  type: object
  status:
  type: object

staging/src/slime.io/slime/modules/bundle-hango/README.md

@@ -3,8 +3,14 @@
 
 ## 安装
 
-1. 安装`slime`组件前，需要安装相关`CRD`
+1. 安装`slime`组件前，需要安装相关`CRD
 
-对于v1.22及以上版本，使用[v1版本](install/crds-v1.yaml)， 对于v1.22以下使用[v1beta1版本](install/crds-v1.yaml)
+需要用户手动 apply [v1版本](install/crds-v1.yaml) 或者 [v1beta1版本](install/crds-v1beta1.yaml) 版本的`CRD`
+
+**注意**：
+
+k8s version >= v1.22，只支持`apiextensions.k8s.io/v1`版本的`CRD`，不再支持`apiextensions.k8s.io/v1beta1`版本`CRD`，详见[k8s官方文档](https://kubernetes.io/docs/reference/using-api/deprecation-guide/#customresourcedefinition-v122)
+
+1.16 <= k8s version < v1.22 两个版本选其一
 
 2. 安装`slime`组件，使用[deployment](install/slime-hango.yaml)

staging/src/slime.io/slime/modules/bundle-hango/install/crds-v1.yaml

@@ -38,7 +38,7 @@ spec:
  items:
  type: string
  type: array
- plugins:
+ plugin:
  items:
  oneOf:
  - not:
@@ -84,7 +84,7 @@ spec:
  description: Unordered map of dynamically typed values.
  type: object
  type: object
- type_url:
+ typeUrl:
  type: string
  rider:
  type: object
@@ -155,7 +155,7 @@ spec:
  type: string
  type: object
  type: array
- workload_selector:
+ workloadLabels:
  description: '`WorkloadSelector` specifies the criteria used to determine
  if the `Gateway`, `Sidecar`, or `EnvoyFilter` or `ServiceEntry` configuration
  can be applied to a proxy. The matching criteria includes the metadata
@@ -164,15 +164,8 @@ spec:
  the initial handshake. If multiple conditions are specified, all conditions
  need to match in order for the workload instance to be selected. Currently,
  only label based selection mechanism is supported.'
- properties:
- labels:
- additionalProperties:
- type: string
- description: One or more labels that indicate a specific set of pods/VMs
- on which the configuration should be applied. The scope of label
- search is restricted to the configuration namespace in which the
- the resource is present.
- type: object
+ additionalProperties:
+ type: string
  type: object
  status:
  type: object
@@ -294,7 +287,7 @@ spec:
  description: Unordered map of dynamically typed values.
  type: object
  type: object
- type_url:
+ typeUrl:
  type: string
  rider:
  type: object
@@ -380,7 +373,7 @@ spec:
  items:
  type: string
  type: array
- workload_selector:
+ workloadSelector:
  description: '`WorkloadSelector` specifies the criteria used to determine
  if the `Gateway`, `Sidecar`, or `EnvoyFilter` or `ServiceEntry` configuration
  can be applied to a proxy. The matching criteria includes the metadata
@@ -389,15 +382,8 @@ spec:
  the initial handshake. If multiple conditions are specified, all conditions
  need to match in order for the workload instance to be selected. Currently,
  only label based selection mechanism is supported.'
- properties:
- labels:
- additionalProperties:
- type: string
- description: One or more labels that indicate a specific set of pods/VMs
- on which the configuration should be applied. The scope of label
- search is restricted to the configuration namespace in which the
- the resource is present.
- type: object
+ additionalProperties:
+ type: string
  type: object
  status:
  type: object

staging/src/slime.io/slime/modules/bundle-hango/install/slime-hango.yaml

@@ -63,9 +63,6 @@ spec:
  - containerPort: 8081
  name: aux-port
  protocol: TCP
- - containerPort: 8082
- name: log-source-port
- protocol: TCP
  readinessProbe:
  failureThreshold: 1
  httpGet: