From aafd532d3dca0d2fef504af8f1b6168b0c126922 Mon Sep 17 00:00:00 2001
From: kiali-bot <kiali-dev@googlegroups.com>
Date: Fri, 17 Jul 2020 20:11:22 +0000
Subject: [PATCH] Release 1.21.0

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

diff --git a/Makefile b/Makefile
index 1eea96e2..39e23e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ ROOTDIR=$(CURDIR)
 OUTDIR=${ROOTDIR}/_output
 
 # Identifies the current build.
-VERSION ?= v1.21.0-SNAPSHOT
+VERSION ?= v1.21.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 651c1e6c..7e0dee1a 100644
--- a/deploy/kiali-operator-all-in-one.yaml
+++ b/deploy/kiali-operator-all-in-one.yaml
@@ -1,6 +1,6 @@
-# Kiali Operator 'latest' All-in-One YAML
+# Kiali Operator 'v1.21.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 Jun 26 20:09:16 UTC 2020
+# Auto-generated by merge-operator-yaml.sh on Fri Jul 17 19:57:13 UTC 2020
 ---
 apiVersion: v1
 kind: Namespace
@@ -8,7 +8,7 @@ metadata:
   name: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -16,7 +16,7 @@ metadata:
   name: monitoringdashboards.monitoring.kiali.io
   labels:
     app: kiali
-    version: master
+    version: v1.21.0
 spec:
   group: monitoring.kiali.io
   names:
@@ -33,7 +33,7 @@ metadata:
   name: kialis.kiali.io
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 spec:
   group: kiali.io
   names:
@@ -57,7 +57,7 @@ metadata:
   name: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 rules:
 - apiGroups: [""]
   resources:
@@ -342,7 +342,7 @@ metadata:
   namespace: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -350,7 +350,7 @@ metadata:
   name: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 subjects:
 - kind: ServiceAccount
   name: kiali-operator
@@ -367,7 +367,7 @@ metadata:
   namespace: kiali-operator
   labels:
     app: kiali-operator
-    version: master
+    version: v1.21.0
 spec:
   replicas: 1
   selector:
@@ -380,14 +380,14 @@ spec:
         app: kiali-operator
         # required for the operator SDK metric service selector
         name: kiali-operator
-        version: master
+        version: v1.21.0
       annotations:
         prometheus.io/scrape: "true"
     spec:
       serviceAccountName: kiali-operator
       containers:
       - name: operator
-        image: quay.io/kiali/kiali-operator:latest
+        image: quay.io/kiali/kiali-operator:v1.21.0
         imagePullPolicy: IfNotPresent
         args:
         - "--zap-level=info"