From 1aba6fcbe64ec78c98e8dc5d60a804964e3d99f8 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 2 Oct 2020 10:44:15 -0700
Subject: [PATCH] Fix the warning due to double CRDs

---
 .../kubezero-istio/templates/istio-base.yaml  | 72 -------------------
 charts/kubezero-istio/update.sh               |  3 +
 2 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/charts/kubezero-istio/templates/istio-base.yaml b/charts/kubezero-istio/templates/istio-base.yaml
index bed5d053..64e4f027 100644
--- a/charts/kubezero-istio/templates/istio-base.yaml
+++ b/charts/kubezero-istio/templates/istio-base.yaml
@@ -3792,78 +3792,6 @@ spec:
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
-metadata:
-  name: istiooperators.install.istio.io
-  labels:
-    release: istio
-spec:
-  group: install.istio.io
-  names:
-    kind: IstioOperator
-    plural: istiooperators
-    singular: istiooperator
-    shortNames:
-      - iop
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - description: Istio control plane revision
-          jsonPath: .spec.revision
-          name: Revision
-          type: string
-        - description: IOP current state
-          jsonPath: .status.status
-          type: string
-          name: Status
-        - jsonPath: .metadata.creationTimestamp
-          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"
-          name: Age
-          type: date
-      name: v1alpha1
-      schema:
-        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"
-              x-kubernetes-preserve-unknown-fields: true
-              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/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html &
-                https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
-              x-kubernetes-preserve-unknown-fields: true
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
 metadata:
   annotations:
     "helm.sh/resource-policy": keep
diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh
index ed21ba00..3e1f876e 100755
--- a/charts/kubezero-istio/update.sh
+++ b/charts/kubezero-istio/update.sh
@@ -21,3 +21,6 @@ patch  -i istio-operator.patch -p0
 
 # Extract base / CRDs from istioctl into plain manifest to workaround chicken egg problem with CRDs
 ./istioctl manifest generate --set profile=empty --set components.base.enabled=true > templates/istio-base.yaml
+
+# Remove double CRD
+patch  -i istio-base.patch -p3