diff --git a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl index 0ac264461ff8adf7c70aef1b7651e233119a76a4..06b0ba995d433af38b64313819710cbb9efc6910 100644 --- a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl +++ b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl @@ -11,49 +11,24 @@ metadata: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - name: istiocontrolplanes.install.istio.io + name: istiooperators.install.istio.io labels: kubernetes.io/minikube-addons: istio - addonmanager.kubernetes.io/mode: EnsureExists + addonmanager.kubernetes.io/mode: EnsureExists spec: group: install.istio.io names: - kind: IstioControlPlane - listKind: IstioControlPlaneList - plural: istiocontrolplanes - singular: istiocontrolplane + kind: IstioOperator + listKind: IstioOperatorList + plural: istiooperators + singular: istiooperator shortNames: - - icp + - iop scope: Namespaced subresources: status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. - More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. - More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - spec: - description: 'Specification of the desired state of the istio control plane resource. - More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' - type: object - status: - description: 'Status describes each of istio control plane component status at the current time. - 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. - More info: https://github.com/istio/operator/blob/master/pkg/apis/istio/v1alpha2/v1alpha2.pb.html & - https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' - type: object versions: - - name: v1alpha2 + - name: v1alpha1 served: true storage: true ... @@ -243,9 +218,9 @@ spec: serviceAccountName: istio-operator containers: - name: istio-operator - image: docker.io/istio/operator:1.4.0 + image: docker.io/istio/operator:1.5.0 command: - - istio-operator + - operator - server imagePullPolicy: Always resources: @@ -257,7 +232,7 @@ spec: memory: 128Mi env: - name: WATCH_NAMESPACE - value: "" + value: "istio-system" - name: LEADER_ELECTION_NAMESPACE valueFrom: fieldRef: diff --git a/deploy/addons/istio/README.md b/deploy/addons/istio/README.md index 0cc971bcf5a05214a2b681b77772cf646cc70f6f..306948b87614ca059f9ea5482ffc22c4c614c9b2 100644 --- a/deploy/addons/istio/README.md +++ b/deploy/addons/istio/README.md @@ -3,9 +3,10 @@ ### Enable istio on minikube Make sure to start minikube with at least 8192 MB of memory and 4 CPUs. +See official [Platform Setup](https://istio.io/docs/setup/platform-setup/) documentation. ```shell script -minikube start --memory=8000mb --cpus=4 +minikube start --memory=8192mb --cpus=4 ``` To enable this addon, simply run: diff --git a/deploy/addons/istio/istio-default-profile.yaml.tmpl b/deploy/addons/istio/istio-default-profile.yaml.tmpl index 036c6f31dd55ecf1bdb09606e41a7401289d6ac3..6f4ade1271db7b88d413385ff27fdfec190ee1ee 100644 --- a/deploy/addons/istio/istio-default-profile.yaml.tmpl +++ b/deploy/addons/istio/istio-default-profile.yaml.tmpl @@ -1,10 +1,19 @@ -apiVersion: install.istio.io/v1alpha2 -kind: IstioControlPlane +apiVersion: v1 +kind: Namespace metadata: - namespace: istio-operator + name: istio-system + labels: + kubernetes.io/minikube-addons: istio + addonmanager.kubernetes.io/mode: EnsureExists + +--- +apiVersion: install.istio.io/v1alpha1 +kind: IstioOperator +metadata: + namespace: istio-system name: example-istiocontrolplane labels: kubernetes.io/minikube-addons: istio - addonmanager.kubernetes.io/mode: Reconcile + addonmanager.kubernetes.io/mode: Reconcile spec: profile: default