From 2e2688ad08122b14bc099b104167cf2dc122d85b Mon Sep 17 00:00:00 2001
From: kiali-bot <kiali-dev@googlegroups.com>
Date: Fri, 8 May 2020 19:37:59 +0000
Subject: [PATCH] Release 1.18.0

---
 Makefile                              |  2 +-
 deploy/kiali-operator-all-in-one.yaml | 36 +++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 6b7b2c0d..736dde83 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ ROOTDIR=$(CURDIR)
 OUTDIR=${ROOTDIR}/_output
 
 # Identifies the current build.
-VERSION ?= v1.18.0-SNAPSHOT
+VERSION ?= v1.18.0
 COMMIT_HASH ?= $(shell git rev-parse HEAD)
 
 # Identifies the Kiali operator container image that will be built
diff --git a/deploy/kiali-operator-all-in-one.yaml b/deploy/kiali-operator-all-in-one.yaml
index f4eb0d49..255bfe30 100644
--- a/deploy/kiali-operator-all-in-one.yaml
+++ b/deploy/kiali-operator-all-in-one.yaml
@@ -1,6 +1,14 @@
-# Kiali Operator 'latest' All-in-One YAML
+# 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 Mon May  4 23:45:34 EDT 2020
+# Auto-generated by merge-operator-yaml.sh on Fri May  8 19:27:37 UTC 2020
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kiali-operator
+  labels:
+    app: kiali-operator
+    version: v1.18.0
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -8,7 +16,7 @@ metadata:
   name: monitoringdashboards.monitoring.kiali.io
   labels:
     app: kiali
-    version: master
+    version: v1.18.0
 spec:
   group: monitoring.kiali.io
   names:
@@ -25,7 +33,7 @@ metadata:
   name: kialis.kiali.io
   labels:
     app: kiali-operator
-    version: master
+    version: v1.18.0
 spec:
   group: kiali.io
   names:
@@ -42,14 +50,6 @@ spec:
     served: true
     storage: true
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kiali-operator
-  labels:
-    app: kiali-operator
-    version: master
----
 # NOTE: Changes to this file must be reflected in the OperatorHub.io CSV file
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -57,7 +57,7 @@ metadata:
   name: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.18.0
 rules:
 - apiGroups: [""]
   resources:
@@ -341,7 +341,7 @@ metadata:
   namespace: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.18.0
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -349,7 +349,7 @@ metadata:
   name: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.18.0
 subjects:
 - kind: ServiceAccount
   name: kiali-operator
@@ -366,7 +366,7 @@ metadata:
   namespace: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.18.0
 spec:
   replicas: 1
   selector:
@@ -377,7 +377,7 @@ spec:
       name: kiali-operator
       labels:
         app: kiali-operator
-        version: master
+        version: v1.18.0
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "8383"
@@ -385,7 +385,7 @@ spec:
       serviceAccountName: kiali-operator
       containers:
       - name: operator
-        image: quay.io/kiali/kiali-operator:latest
+        image: quay.io/kiali/kiali-operator:v1.18.0
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - mountPath: /tmp/ansible-operator/runner