Application Istio Fluxcd manifests

This commit creates the manifests for Istio deployment and Kiali. Istio operator is used to deploy the Istio components (data-plane, control-plane, gateway and cni). This commit also up-versioned Istio from 1.13.2 to 1.13.3. Test Plan: Pass: Centos: istio application uploaded/applied manually Pass: Debian build successfully Story: 2009912 Task: 45191 Change-Id: I3e9dc0605c53e329277fc507aada565b5182b484 Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
2022-04-22 11:38:42 -04:00
parent b36b751f38
commit 86c26d6aca
23 changed files with 84 additions and 46 deletions
--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,10 @@
+# This is a cross-platform list tracking distribution packages needed for install and tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+libffi-dev [platform:dpkg]
+libldap2-dev [platform:dpkg]
+libxml2-dev [platform:dpkg]
+libxslt1-dev [platform:dpkg]
+libsasl2-dev [platform:dpkg]
+libffi-devel [platform:rpm]
+python3-all-dev [platform:dpkg]
--- a/centos_tarball-dl.lst
+++ b/centos_tarball-dl.lst
@@ -1,2 +1,2 @@
-helm-charts-istio-1.13.2.tar.gz#helm-charts-istio#https://github.com/istio/istio/archive/refs/tags/1.13.2.tar.gz#http##
+helm-charts-istio-1.13.3.tar.gz#helm-charts-istio#https://github.com/istio/istio/archive/refs/tags/1.13.3.tar.gz#http##
 helm-charts-kiali-1.45.0.tar.gz#helm-charts-kiali#https://github.com/kiali/helm-charts/archive/refs/tags/v1.45.0.tar.gz#http##
--- a/istio-helm/centos/build_srpm.data
+++ b/istio-helm/centos/build_srpm.data
@@ -1,5 +1,5 @@
 TAR_NAME=helm-charts-istio
-VERSION=1.13.2
+VERSION=1.13.3
 TAR="$TAR_NAME-$VERSION.tar.gz"

 COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
--- a/istio-helm/centos/istio-helm.spec
+++ b/istio-helm/centos/istio-helm.spec
@@ -3,7 +3,7 @@

 Summary: Istio helm charts
 Name: istio-helm
-Version: 1.13.2
+Version: 1.13.3
 Release: %{tis_patch_ver}%{?_tis_dist}
 License: Apache-2.0
 Group: base
@@ -38,12 +38,10 @@ helm repo add local http://localhost:8879/charts
 cp %{SOURCE3} manifests/charts
 cd manifests/charts

-sed -i -e '/appVersion/ s/:.*$/: %{version}/' istio-operator/Chart.yaml
-sed -i -e '/version/ s/:.*$/: %{version}/' istio-operator/Chart.yaml
+find . -type f -name "Chart.yaml" -exec sed -i -e '/version/ s/:.*$/: %{version}/' {} \;

 make istio-operator
-# mv istio-operator-*.tgz istio-operator-%{version}.tgz
- 
+
 cd -

 # terminate helm server (the last backgrounded task)
--- a/istio-helm/debian/deb_folder/rules
+++ b/istio-helm/debian/deb_folder/rules
@@ -3,8 +3,7 @@

 export ROOT = debian/tmp
 export CHART_FOLDER = $(ROOT)/usr/lib/helm
-export ISTIO_VERSION = 1.13.2
-export ISTIO_TARBALL="helm-charts-istio-1.13.2.tgz
+export ISTIO_VERSION = 1.13.3

 %:
 	dh $@
@@ -17,6 +16,7 @@ override_dh_auto_build:
 	helm repo add local http://localhost:8879/charts
 	# Set up chart build files.
 	cp Makefile manifests/charts
+	find . -type f -name "Chart.yaml" -exec sed -i -e '/version/ s/:.*/: ${ISTIO_VERSION}/' {} \;
 	# Create the TGZ file.
 	cd manifests/charts && make istio-operator
 	pkill chartmuseum
--- a/istio-helm/debian/meta_data.yaml
+++ b/istio-helm/debian/meta_data.yaml
@@ -2,14 +2,14 @@
 debname: istio-helm
 debver: 1.0-1
 dl_path:
-  name: helm-charts-istio-1.13.2.tar.gz
-  url: https://github.com/istio/istio/archive/refs/tags/1.13.2.tar.gz 
-  md5sum: d5b109c3332d10b7fb8214b0d23ff90b
+  name: helm-charts-istio-1.13.3.tar.gz
+  url: https://github.com/istio/istio/archive/refs/tags/1.13.3.tar.gz
+  md5sum: 908fcd8e947a831883b76144939b79d0
 src_files:
-  - istio-helm/files/index.yaml
-  - istio-helm/files/Makefile
-  - istio-helm/files/metadata.yaml
-  - istio-helm/files/repositories.yaml
+  - files/index.yaml
+  - files/Makefile
+  - files/metadata.yaml
+  - files/repositories.yaml
 revision:
  dist: $STX_DIST
  PKG_GITREVCOUNT: true
--- a/kiali-helm/centos/kiali-helm.spec
+++ b/kiali-helm/centos/kiali-helm.spec
@@ -18,6 +18,7 @@ Source3: Makefile
 BuildArch:     noarch

 BuildRequires: helm
+BuildRequires: gettext

 %description
 StarlingX Kiali Helm Charts
@@ -26,7 +27,6 @@ StarlingX Kiali Helm Charts
 %setup -n helm-charts-kiali

 %build
-echo $PATH
 make build-helm-charts

 %install
--- a/kiali-helm/debian/deb_folder/control
+++ b/kiali-helm/debian/deb_folder/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
 Build-Depends: debhelper-compat (= 13),
 helm,
+ gettext,
 procps
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
--- a/kiali-helm/debian/deb_folder/rules
+++ b/kiali-helm/debian/deb_folder/rules
@@ -9,7 +9,7 @@ export CHART_FOLDER = $(ROOT)/usr/lib/helm

 override_dh_auto_build:
 	# Create the TGZ file.
-	helm package kiali-server --app-version $(APP_VERSION) --version $(APP_VERSION)
+	make build-helm-charts

 override_dh_auto_install:
 	# Install the app tar file.
--- a/kiali-helm/debian/meta_data.yaml
+++ b/kiali-helm/debian/meta_data.yaml
@@ -8,7 +8,6 @@ dl_path:
 src_files:
  - files/index.yaml
  - files/Makefile
-  - files/metadata.yaml
  - files/repositories.yaml
 revision:
  dist: $STX_DIST
--- a/python-k8sapp-istio/k8sapp_istio/k8sapp_istio/helm/istio_operator.py
+++ b/python-k8sapp-istio/k8sapp_istio/k8sapp_istio/helm/istio_operator.py
@@ -14,11 +14,11 @@ class IstioHelm(base.BaseHelm):
    """Class to encapsulate helm operations for the istio chart"""

    SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + \
-        [app_constants.HELM_NS_ISTIO_OPERATOR]
+        [app_constants.HELM_NS_ISTIO_SYSTEM]
    SUPPORTED_APP_NAMESPACES = {
        app_constants.HELM_APP_ISTIO:
            base.BaseHelm.SUPPORTED_NAMESPACES +
-            [app_constants.HELM_NS_ISTIO_OPERATOR]
+            [app_constants.HELM_NS_ISTIO_SYSTEM]
    }

    CHART = app_constants.HELM_CHART_ISTIO_OPERATOR
@@ -30,7 +30,7 @@ class IstioHelm(base.BaseHelm):

    def get_overrides(self, namespace=None):
        overrides = {
-            app_constants.HELM_NS_ISTIO_OPERATOR: {}
+            app_constants.HELM_NS_ISTIO_SYSTEM: {}
        }

        if namespace in self.SUPPORTED_NAMESPACES:
--- a/python-k8sapp-istio/k8sapp_istio/k8sapp_istio/helm/kiali_server.py
+++ b/python-k8sapp-istio/k8sapp_istio/k8sapp_istio/helm/kiali_server.py
--- a/python-k8sapp-istio/k8sapp_istio/setup.cfg
+++ b/python-k8sapp-istio/k8sapp_istio/setup.cfg
@@ -33,8 +33,8 @@ systemconfig.helm_applications =
    istio = systemconfig.helm_plugins.istio

 systemconfig.helm_plugins.istio =
-    001_istio = k8sapp_istio.helm.istio:IstioHelm
-    002_kiali = k8sapp_istio.helm.kiali:KialiHelm
+    001_istio-operator = k8sapp_istio.helm.istio_operator:IstioHelm
+    002_kiali-server = k8sapp_istio.helm.kiali_server:KialiHelm

 [wheel]
 universal = 1
--- a/stx-istio-helm/centos/build_srpm.data
+++ b/stx-istio-helm/centos/build_srpm.data
@@ -8,7 +8,7 @@ TIS_PATCH_VER=GITREVCOUNT
 TAR_NAME=helm-charts-istio

 # FluxCD version
-ISTIO_VERSION=1.13.2
+ISTIO_VERSION=1.13.3
 FLUXCD_TAR="$TAR_NAME-$ISTIO_VERSION.tar.gz"

 COPY_LIST="${CGCS_BASE}/downloads/$FLUXCD_TAR $PKG_BASE/$SRC_DIR/files/* $PKG_BASE/$SRC_DIR/fluxcd-manifests/*"
--- a/stx-istio-helm/centos/stx-istio-helm.spec
+++ b/stx-istio-helm/centos/stx-istio-helm.spec
@@ -8,8 +8,6 @@
 # Build variables
 %global helm_folder /usr/lib/helm

-%global fluxcd_cm_version 1.13.2
-
 Summary: StarlingX Istio Helm Charts
 Name: stx-istio-helm
 Version: 1.0
--- a/stx-istio-helm/debian/meta_data.yaml
+++ b/stx-istio-helm/debian/meta_data.yaml
@@ -1,12 +1,7 @@
 ---
 debname: stx-istio-helm
 debver: 1.0-1
-src_path: null
-src_files:
-  - stx-istio-helm/files
-  - stx-istio-helm/helm-charts
-  - stx-istio-helm/manifests
-
+src_path: stx-istio-helm
 revision:
  dist: $STX_DIST
  PKG_GITREVCOUNT: true
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/base/namespace.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/base/namespace.yaml
@@ -7,4 +7,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: istio-operator 
+  name: istio-system
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/helmrelease.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/helmrelease.yaml
@@ -15,7 +15,7 @@ spec:
  chart:
    spec:
      chart: istio-operator 
-      version: 1.13.2 
+      version: 1.13.3
      sourceRef:
        kind: HelmRepository
        name: stx-platform
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator-static-overrides.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator-static-overrides.yaml
@@ -4,12 +4,17 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-hub: gcr.io/istio-testing
-tag: latest
+replicaCount: 1
+images:
+  tags:
+    istio-operator: docker.io/istio/operator:1.13.3
+    cni: docker.io/istio/install-cni:1.13.3
+    pilot: docker.io/istio/pilot:1.13.3
+    proxyv2: docker.io/istio/proxyv2:1.13.3

 # ImagePullSecrets for operator ServiceAccount, list of secrets in the same namespace
 # used to pull operator image. Must be set for any cluster configured with private docker registry.
-imagePullSecrets: []
+imagePullSecrets: [{"name": "default-registry-key"}]

 # Used to replace istioNamespace to support operator watch multiple namespaces.
 watchedNamespaces: istio-system
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml
@@ -0,0 +1,31 @@
+apiVersion: install.istio.io/v1alpha1
+kind: IstioOperator
+metadata:
+  namespace: istio-system
+  name: example-istiocontrolplane
+spec:
+  profile: demo
+  components:
+    cni:
+      enabled: true
+  values:
+    sidecarInjectorWebhook:
+      injectedAnnotations:
+        k8s.v1.cni.cncf.io/networks: istio-cni
+    cni:
+      chained: false
+      cniBinDir: /usr/libexec/cni
+      cniConfDir: /etc/cni/net.d
+      cniConfFileName: istio-cni.conf
+      excludeNamespaces:
+        - kube-system
+        - istio-operator
+        - istio-system
+      image: registry.local:9001/docker.io/istio/install-cni:1.13.3
+    pilot:
+      image: registry.local:9001/docker.io/istio/pilot:1.13.3
+    global:
+      proxy:
+        image: registry.local:9001/docker.io/istio/proxyv2:1.13.3
+      proxy_init:
+        image: registry.local:9001/docker.io/istio/proxyv2:1.13.3
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/kustomization.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/kustomization.yaml
@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-namespace: istio-operator 
+namespace: istio-system
 resources:
  - helmrelease.yaml
+  - istio-operator.yaml
 secretGenerator:
  - name: istio-operator-static-overrides
    files:
--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml
@@ -8,10 +8,10 @@ replicaCount: 1
 namespace: istio-system
 images:
  tags:
-    kiali: docker.io/starlingx/kiali-server:stx.7.0-v0.1.0
-image:
-  host: registry.local:9001/docker.io/starlingx
-  image: kiali-server 
-  tags: stx.7.0-v0.1.0
-  tag: stx.7.0-v0.1.0
+    kiali: quay.io/kiali/kiali:v1.45.0
+deployment:
+  image_name: registry.local:9001/quay.io/kiali/kiali
+  image_pull_secrets: ["default-registry-key"]
+  image_version: v1.45.0
+  version_label: v1.45.0

--- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kustomization.yaml
+++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kustomization.yaml
@@ -6,7 +6,7 @@

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: istio-operator 
+namespace: istio-system
 resources:
  - base
  - istio-operator