Merge pull request #40 from jmazzitelli/v1.18

Merge final Sprint 39 work into V1.18

.gitignore

@@ -1,2 +1,5 @@
 molecule/maistra-e2e/assets/secret.yaml
 _output
+
+# Do not commit any compiled Ansible filter plugins
+*.pyc

.travis.yml

@@ -8,6 +8,14 @@ arch:
   # So this is disabled for now. We can re-enable if we need this.
   #- arm64
 
+# The channel name "chat.freenode.net#kiali" is encrypted to prevent IRC spam from forks
+notifications:
+ irc:
+   channels:
+      - secure: D7BiCSh0qJzKsEYmWsCdt2XaQve2yQPqF97LaCVU70nNDUMmzwvd8B24lVp4LcmS0t6jkIMvOiLB4PJldjNk/s5Y6IH23+7id/gRFopKLAI2DynqhLlDs0asRRzeUbzDlqdMP8AtyzIUcKnB0MLExoM1TIoHHHc9z1CbyFFFw3JDS12NWf35Lr5KNf0YojtdU/YSDGse33lGuUlZD8p9JacSI09BEUrzgtfuetD5LInbp9f+283hAlj7kY5psonDVvISQTRavT98GIpimo/7Gq0fesKoWPSOks5Y30MkAB+NVfVmECe6r1iqIeUXrdttjTnT+kqiW0OPQPYek5vO9RCr1N7qjhz8xjEbfV5MM5a1utc0VfniLs+1nwHoMqoYW9G8ke2XGgxvWhJyLi8uX6ATutpMMIbVkHsUIx12Y86rxF30VLnt7EhFMZVagp3zcJaoTUua2aXOhpNue3HA2SBpmUW7uqXQyDMf3H27sosdW0isF/J2utYTK+ENv6lyZ7eqDbNnlJiVRGunMfuQosVe+NT5Fpn7k3d+yw94decCMWfxg7SbWapeRcy3V1GTfDo5lhp4qO040Zf9FKa3GCjTXWQFxsFVipllun8aRELibA7uZJnoXEavJNYoaT5TfSFBgBQVfyRkM2X004B+VuALowE2NOYzOqTLgWHPzS8=
+   on_success: change
+   on_failure: change
+
 language: python
 addons:
   apt:

deploy/kiali-operator-all-in-one.yaml

@@ -1,6 +1,6 @@
 # Kiali Operator 'v1.18.0' All-in-One YAML
 # This operator will not be able to support deployment.accessible_namespaces=['**'].
-# Auto-generated by merge-operator-yaml.sh on Fri May  8 19:27:37 UTC 2020
+# Auto-generated by merge-operator-yaml.sh on Fri May 15 15:27:55 EDT 2020
 ---
 apiVersion: v1
 kind: Namespace
@@ -377,10 +377,11 @@ spec:
       name: kiali-operator
       labels:
         app: kiali-operator
+        # required for the operator SDK metric service selector
+        name: kiali-operator
         version: v1.18.0
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "8383"
     spec:
       serviceAccountName: kiali-operator
       containers:
@@ -405,6 +406,11 @@ spec:
           value: "kiali-operator"
         - name: ANSIBLE_DEBUG_LOGS
           value: "True"
+        ports:
+        - name: http-metrics
+          containerPort: 8383
+        - name: cr-metrics
+          containerPort: 8686
       volumes:
       - name: runner
         emptyDir: {}

deploy/kiali/kiali_cr.yaml

@@ -433,8 +433,7 @@ spec:
 # istio_identity_domain: The annotation used by Istio to identify domains.
 # istio_sidecar_annotation: The pod annotation used by Istio to identify the sidecar.
 # istio_status_enabled: Enable/Disable of istio component status into masthead indicator. It defaults to true.
-# url_service_version: The Istio service used to determine the Istio version.
-#                      If empty, assumes it is in the istio namespace at the URL "http://istio-pilot.<istio_namespace>:8080/version"
+# url_service_version: The Istio service used to determine the Istio version. If empty, assumes the URL for the well-known Istio version endpoint.
 #    ---
 #    istio:
 #      istio_identity_domain: "svc.cluster.local"

deploy/kiali/kiali_cr_dev.yaml

@@ -5,6 +5,7 @@ metadata:
   annotations:
     ansible.operator-sdk/verbosity: "1"
 spec:
+  istio_namespace: ${ISTIO_NAMESPACE}
   version: "${KIALI_CR_SPEC_VERSION}"
   auth:
     strategy: $AUTH_STRATEGY

deploy/kiali/kiali_cr_dev_servicemesh.yaml

@@ -5,6 +5,7 @@ metadata:
   annotations:
     ansible.operator-sdk/verbosity: "1"
 spec:
+  istio_namespace: "${ISTIO_NAMESPACE}"
   version: "${KIALI_CR_SPEC_VERSION}"
   auth:
     strategy: "${AUTH_STRATEGY}"

deploy/operator.yaml

@@ -17,10 +17,11 @@ spec:
       name: kiali-operator
       labels:
         app: kiali-operator
+        # required for the operator SDK metric service selector
+        name: kiali-operator
         version: ${OPERATOR_VERSION_LABEL}
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "8383"
     spec:
       serviceAccountName: kiali-operator
       containers:
@@ -45,6 +46,11 @@ spec:
           value: "kiali-operator"
         - name: ANSIBLE_DEBUG_LOGS
           value: "True"
+        ports:
+        - name: http-metrics
+          containerPort: 8383
+        - name: cr-metrics
+          containerPort: 8686
       volumes:
       - name: runner
         emptyDir: {}

dev-hosts

@@ -8,6 +8,12 @@ all:
       image_version: dev
       namespace: istio-system
 
+    external_services:
+      istio:
+        url_service_version: http://istiod.istio-system:15014/version
+        # For Istio 1.5 and earlier
+        #url_service_version: http://istio-pilot.istio-system:8080/version
+
     # The Operator SDK creates a "_kiali_io_kiali" variable that
     # mimics the Kiali CR but maintains camelCase in key names.
     # This will only be useful for certain cases (e.g. when

manifests/kiali-community/1.16.0/kiali.v1.16.0.clusterserviceversion.yaml → manifests/kiali-community/1.18.1/kiali.v1.18.1.clusterserviceversion.yaml

@@ -1,17 +1,17 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
-  name: kiali-operator.v1.16.0
+  name: kiali-operator.v1.18.1
   namespace: placeholder
   annotations:
     categories: Monitoring,Logging & Tracing
     certified: "false"
-    containerImage: quay.io/kiali/kiali-operator:v1.16.0
+    containerImage: quay.io/kiali/kiali-operator:v1.18.1
     capabilities: Deep Insights
     support: Kiali
     description: "Kiali project provides answers to the questions: What microservices are part of my Istio service mesh and how are they connected?"
     repository: https://github.com/kiali/kiali
-    createdAt: 2020-03-25T00:00:00Z
+    createdAt: 2020-05-15T00:00:00Z
     alm-examples: |-
       [
         {
@@ -73,7 +73,7 @@ metadata:
         }
       ]
 spec:
-  version: 1.16.0
+  version: 1.18.1
   maturity: stable
   replaces: kiali-operator.v1.15.1
   displayName: Kiali Operator
@@ -261,26 +261,16 @@ spec:
               name: kiali-operator
               labels:
                 app: kiali-operator
-                version: v1.16.0
+                # required for the operator SDK metric service selector
+                name: kiali-operator
+                version: v1.18.1
               annotations:
                 prometheus.io/scrape: "true"
-                prometheus.io/port: "8383"
             spec:
               serviceAccountName: kiali-operator
               containers:
-              - name: ansible
-                command:
-                - /usr/local/bin/ao-logs
-                - /tmp/ansible-operator/runner
-                - stdout
-                image: quay.io/kiali/kiali-operator:v1.16.0
-                imagePullPolicy: "IfNotPresent"
-                volumeMounts:
-                - mountPath: /tmp/ansible-operator/runner
-                  name: runner
-                  readOnly: true
               - name: operator
-                image: quay.io/kiali/kiali-operator:v1.16.0
+                image: quay.io/kiali/kiali-operator:v1.18.1
                 imagePullPolicy: "IfNotPresent"
                 volumeMounts:
                 - mountPath: /tmp/ansible-operator/runner
@@ -302,6 +292,11 @@ spec:
                   value: "kiali-operator"
                 - name: ANSIBLE_DEBUG_LOGS
                   value: "True"
+                ports:
+                - name: http-metrics
+                  containerPort: 8383
+                - name: cr-metrics
+                  containerPort: 8686
               volumes:
               - name: runner
                 emptyDir: {}

manifests/kiali-community/kiali.package.yaml

@@ -1,7 +1,7 @@
 packageName: kiali
 channels:
 - name: alpha
-  currentCSV: kiali-operator.v1.16.0
+  currentCSV: kiali-operator.v1.18.1
 - name: stable
-  currentCSV: kiali-operator.v1.16.0
+  currentCSV: kiali-operator.v1.18.1
 defaultChannel: stable