diff --git a/helm/core/.helmignore b/helm/core/.helmignore new file mode 100644 index 000000000..99ef100fe --- /dev/null +++ b/helm/core/.helmignore @@ -0,0 +1 @@ +crds/customresourcedefinitions.gen_lt1.16.yaml \ No newline at end of file diff --git a/helm/core/crds/customresourcedefinitions.gen_lt1.16.yaml b/helm/core/crds/customresourcedefinitions.gen_lt1.16.yaml new file mode 100644 index 000000000..359dc138a --- /dev/null +++ b/helm/core/crds/customresourcedefinitions.gen_lt1.16.yaml @@ -0,0 +1,176 @@ +# DO NOT EDIT - Generated by Cue OpenAPI generator based on Istio APIs. +apiVersion: apiextensions.k8s.io/v1beta1 +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 + 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 + versions: + - name: v1alpha1 + served: true + storage: true + version: v1alpha1 + validation: + openAPIV3Schema: + properties: + spec: + properties: + defaultConfig: + type: object + x-kubernetes-preserve-unknown-fields: true + defaultConfigDisable: + type: boolean + 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 + configDisable: + type: boolean + 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 + subresources: + status: {} +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + annotations: + "helm.sh/resource-policy": keep + name: mcpbridges.networking.higress.io +spec: + group: networking.higress.io + names: + categories: + - higress-io + kind: McpBridge + listKind: McpBridgeList + plural: mcpbridges + singular: mcpbridge + scope: Namespaced + versions: + - name: v1 + served: true + storage: true + version: v1 + validation: + openAPIV3Schema: + properties: + spec: + properties: + registries: + items: + properties: + consulNamespace: + type: string + domain: + type: string + nacosAccessKey: + type: string + nacosAddressServer: + type: string + nacosGroups: + items: + type: string + type: array + nacosNamespace: + type: string + nacosNamespaceId: + type: string + nacosRefreshInterval: + format: int64 + type: integer + nacosSecretKey: + type: string + name: + type: string + port: + type: integer + type: + type: string + zkServicesPath: + items: + type: string + type: array + type: object + type: array + type: object + type: object + x-kubernetes-preserve-unknown-fields: true + type: object + subresources: + status: {} +--- diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml index f2907d963..f67e846b5 100644 --- a/helm/core/templates/controller-deployment.yaml +++ b/helm/core/templates/controller-deployment.yaml @@ -100,6 +100,10 @@ spec: fieldPath: spec.serviceAccountName - name: KUBECONFIG value: /var/run/secrets/remote/config + - name: PRIORITIZED_LEADER_ELECTION + value: "false" + - name: INJECT_ENABLED + value: "false" {{- if .Values.pilot.env }} {{- range $key, $val := .Values.pilot.env }} - name: {{ $key }} diff --git a/pkg/ingress/kube/ingress/status.go b/pkg/ingress/kube/ingress/status.go index 50a93007a..e52295d0d 100644 --- a/pkg/ingress/kube/ingress/status.go +++ b/pkg/ingress/kube/ingress/status.go @@ -39,8 +39,7 @@ type statusSyncer struct { watchedNamespace string - ingressLister ingresslister.IngressLister - ingressClassLister ingresslister.IngressClassLister + ingressLister ingresslister.IngressLister // search service in the mse vpc serviceLister listerv1.ServiceLister } @@ -48,11 +47,10 @@ type statusSyncer struct { // newStatusSyncer creates a new instance func newStatusSyncer(localKubeClient, client kubelib.Client, controller *controller, namespace string) *statusSyncer { return &statusSyncer{ - client: client, - controller: controller, - watchedNamespace: namespace, - ingressLister: client.KubeInformer().Networking().V1beta1().Ingresses().Lister(), - ingressClassLister: client.KubeInformer().Networking().V1beta1().IngressClasses().Lister(), + client: client, + controller: controller, + watchedNamespace: namespace, + ingressLister: client.KubeInformer().Networking().V1beta1().Ingresses().Lister(), // search service in the mse vpc serviceLister: localKubeClient.KubeInformer().Core().V1().Services().Lister(), } diff --git a/pkg/ingress/kube/ingressv1/status.go b/pkg/ingress/kube/ingressv1/status.go index 8417868d2..fe4cdee49 100644 --- a/pkg/ingress/kube/ingressv1/status.go +++ b/pkg/ingress/kube/ingressv1/status.go @@ -40,8 +40,7 @@ type statusSyncer struct { watchedNamespace string - ingressLister ingresslister.IngressLister - ingressClassLister ingresslister.IngressClassLister + ingressLister ingresslister.IngressLister // search service in the mse vpc serviceLister listerv1.ServiceLister } @@ -49,11 +48,10 @@ type statusSyncer struct { // newStatusSyncer creates a new instance func newStatusSyncer(localKubeClient, client kubelib.Client, controller *controller, namespace string) *statusSyncer { return &statusSyncer{ - client: client, - controller: controller, - watchedNamespace: namespace, - ingressLister: client.KubeInformer().Networking().V1().Ingresses().Lister(), - ingressClassLister: client.KubeInformer().Networking().V1().IngressClasses().Lister(), + client: client, + controller: controller, + watchedNamespace: namespace, + ingressLister: client.KubeInformer().Networking().V1().Ingresses().Lister(), // search service in the mse vpc serviceLister: localKubeClient.KubeInformer().Core().V1().Services().Lister(), }