Enable CRD gen for Istio 1.7

Author: stefanprodan

.github/actions/helm/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -l
 
-VERSION=3.2.1
+VERSION=3.3.1
 curl -sL https://get.helm.sh/helm-v${VERSION}-linux-amd64.tar.gz | tar xz
 
 mkdir -p $GITHUB_WORKSPACE/bin

.github/workflows/update-istio.yaml

@@ -28,6 +28,7 @@ jobs:
           helm template ${ISTIO_DIR}/manifests/charts/istio-operator/ \
           --set hub=docker.io/istio \
           --set tag=${ISTIO_VER} \
+          --set enableCRDTemplates=true \
           --set operatorNamespace=istio-operator \
           --set istioNamespace=istio-system  > ./istio/operator/manifests.yaml
 

istio/operator/manifests.yaml

@@ -15,6 +15,80 @@ metadata:
   namespace: istio-operator
   name: istio-operator
 ---
+# Source: istio-operator/templates/crds.yaml
+# SYNC WITH manifests/charts/base/files
+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: {}
+---
 # Source: istio-operator/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

scripts/istio-init.sh

@@ -12,17 +12,18 @@ if [[ ! -x "$(command -v helm)" ]]; then
     exit 1
 fi
 
-VERSION=1.5.2
+VERSION=1.7.0
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 curl -sL https://istio.io/downloadIstio | ISTIO_VERSION=${VERSION} sh -
 
-helm template ${REPO_ROOT}/istio-${VERSION}/install/kubernetes/operator/charts/istio-operator/ \
+helm template ${REPO_ROOT}/istio-${VERSION}/manifests/charts/istio-operator \
   --set hub=docker.io/istio \
   --set tag=${VERSION} \
+  --set enableCRDTemplates=true \
   --set operatorNamespace=istio-operator \
   --set istioNamespace=istio-system  > ${REPO_ROOT}/istio/operator/manifests.yaml
 
 rm -rf ${REPO_ROOT}/istio-${VERSION}
 
-echo "Istio operator ${VERSION} manifests updated"
+echo "Istio operator ${VERSION} manifests updated"