From e5879666bdbc08550759dd78739b0977724caed6 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Tue, 6 Apr 2021 13:58:31 -0700
Subject: [PATCH] Bump API version to v1alpha2

To accomodate the CR syntax changes.

Change-Id: Ie646a9c58655b0987a8fb0d4c914cd8b93190b1b
---
 Makefile                                                      | 4 ++--
 README.md                                                     | 4 ++--
 ...ci_v1alpha1_zuul_cr.yaml => zuul-ci_v1alpha2_zuul_cr.yaml} | 2 +-
 ..._v1alpha1_zuul_crd.yaml => zuul-ci_v1alpha2_zuul_crd.yaml} | 3 +++
 playbooks/zuul-operator-functional/tasks/apply_cr.yaml        | 2 +-
 zuul_operator/objects.py                                      | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)
 rename deploy/crds/{zuul-ci_v1alpha1_zuul_cr.yaml => zuul-ci_v1alpha2_zuul_cr.yaml} (91%)
 rename deploy/crds/{zuul-ci_v1alpha1_zuul_crd.yaml => zuul-ci_v1alpha2_zuul_crd.yaml} (87%)

diff --git a/Makefile b/Makefile
index e703c3f..8229131 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ image:
 	podman build -f build/Dockerfile -t docker.io/zuul/zuul-operator .
 
 install:
-	kubectl apply -f deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml -f deploy/rbac.yaml -f deploy/operator.yaml
+	kubectl apply -f deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml -f deploy/rbac.yaml -f deploy/operator.yaml
 
 deploy-cr:
-	kubectl apply -f deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml
+	kubectl apply -f deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
diff --git a/README.md b/README.md
index 9496895..7e4aacb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ $ make image
 
 ```shell
 $ make install
-kubectl apply -f deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml -f deploy/rbac.yaml -f deploy/operator.yaml
+kubectl apply -f deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml -f deploy/rbac.yaml -f deploy/operator.yaml
 ```
 
 Look for operator pod and check it's output
@@ -33,7 +33,7 @@ $ kubectl logs zuul-operator-c64756f66-rbdmg
 
 ```
 $ kubectl apply -f - <<EOF
-apiVersion: operator.zuul-ci.org/v1alpha1
+apiVersion: operator.zuul-ci.org/v1alpha2
 kind: Zuul
 metadata:
   name: example-zuul
diff --git a/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml b/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
similarity index 91%
rename from deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml
rename to deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
index 55e5954..9d115f7 100644
--- a/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml
+++ b/deploy/crds/zuul-ci_v1alpha2_zuul_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.zuul-ci.org/v1alpha1
+apiVersion: operator.zuul-ci.org/v1alpha2
 kind: Zuul
 metadata:
   name: zuul
diff --git a/deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml b/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
similarity index 87%
rename from deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml
rename to deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
index 707bf03..811bd58 100644
--- a/deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml
+++ b/deploy/crds/zuul-ci_v1alpha2_zuul_crd.yaml
@@ -16,5 +16,8 @@ spec:
     status: {}
   versions:
   - name: v1alpha1
+    served: false
+    storage: false
+  - name: v1alpha2
     served: true
     storage: true
diff --git a/playbooks/zuul-operator-functional/tasks/apply_cr.yaml b/playbooks/zuul-operator-functional/tasks/apply_cr.yaml
index 3c36185..8c04096 100644
--- a/playbooks/zuul-operator-functional/tasks/apply_cr.yaml
+++ b/playbooks/zuul-operator-functional/tasks/apply_cr.yaml
@@ -3,7 +3,7 @@
   k8s:
     namespace: "{{ namespace }}"
     definition:
-      apiVersion: operator.zuul-ci.org/v1alpha1
+      apiVersion: operator.zuul-ci.org/v1alpha2
       kind: Zuul
       metadata:
         name: zuul
diff --git a/zuul_operator/objects.py b/zuul_operator/objects.py
index 658534c..b8d4a3b 100644
--- a/zuul_operator/objects.py
+++ b/zuul_operator/objects.py
@@ -66,7 +66,7 @@ class PerconaXtraDBCluster(NamespacedAPIObject):
 
 
 class ZuulObject(NamespacedAPIObject):
-    version = "operator.zuul-ci.org/v1alpha1"
+    version = "operator.zuul-ci.org/v1alpha2"
     endpoint = "zuuls"
     kind = "Zuul"