From b7b3f480fa07bb2db8e15729e4d926a1a40f3aa3 Mon Sep 17 00:00:00 2001
From: Alex Mirkhaydarov <12385311+alexdotsh@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:15:15 +0100
Subject: [PATCH] Update GlobalTrafficPolicy & Dependency CRD to use
 apiextensions.k8s.io/v1

Signed-off-by: Alex Mirkhaydarov <12385311+alexdotsh@users.noreply.github.com>
---
 admiral/crd/dependency.yaml          | 28 +++++++++++++++++++---
 admiral/crd/globalTraffic.yaml       | 36 +++++++++++++++++++++++++---
 install/admiral/base/crds.yaml       | 31 +++++++++++++++++-------
 install/admiralremote/base/crds.yaml | 36 ++++++++++++++++++++++++----
 4 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/admiral/crd/dependency.yaml b/admiral/crd/dependency.yaml
index a799f5f6..af9a8727 100644
--- a/admiral/crd/dependency.yaml
+++ b/admiral/crd/dependency.yaml
@@ -1,11 +1,33 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: dependencies.admiral.io
 spec:
   group: admiral.io
-  version: v1alpha1
   names:
     kind: Dependency
     plural: dependencies
-  scope: Namespaced
\ No newline at end of file
+    shortNames:
+    - dep
+    - deps
+    singular: dependency
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            properties:
+              source:
+                type: string
+              identityLabel:
+                type: string
+              destinations:
+                type: array
+                items:
+                  type: string
+            type: object
diff --git a/admiral/crd/globalTraffic.yaml b/admiral/crd/globalTraffic.yaml
index f45e0a64..e7a35361 100644
--- a/admiral/crd/globalTraffic.yaml
+++ b/admiral/crd/globalTraffic.yaml
@@ -1,11 +1,41 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: globaltrafficpolicies.admiral.io
 spec:
   group: admiral.io
-  version: v1alpha1
   names:
     kind: GlobalTrafficPolicy
     plural: globaltrafficpolicies
-  scope: Namespaced
\ No newline at end of file
+    shortNames:
+    - gtp
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            properties:
+              policy:
+                items:
+                  properties:
+                    dnsPrefix:
+                      type: string
+                    lbType:
+                      type: integer
+                    target:
+                      items:
+                        properties:
+                          region:
+                            type: string
+                          weight:
+                            type: integer
+                        type: object
+                      type: array
+                  type: object
+                type: array
+            type: object
diff --git a/install/admiral/base/crds.yaml b/install/admiral/base/crds.yaml
index ffc26967..3315e892 100644
--- a/install/admiral/base/crds.yaml
+++ b/install/admiral/base/crds.yaml
@@ -1,19 +1,34 @@
-
 ---
-
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: dependencies.admiral.io
 spec:
   group: admiral.io
-  version: v1alpha1
   names:
     kind: Dependency
     plural: dependencies
-    singular: dependency
     shortNames:
-      - dep
-      - deps
+    - dep
+    - deps
+    singular: dependency
   scope: Namespaced
-
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            properties:
+              source:
+                type: string
+              identityLabel:
+                type: string
+              destinations:
+                type: array
+                items:
+                  type: string
+            type: object
diff --git a/install/admiralremote/base/crds.yaml b/install/admiralremote/base/crds.yaml
index 79199a38..036b75d1 100644
--- a/install/admiralremote/base/crds.yaml
+++ b/install/admiralremote/base/crds.yaml
@@ -1,14 +1,42 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: globaltrafficpolicies.admiral.io
 spec:
   group: admiral.io
-  version: v1alpha1
   names:
     kind: GlobalTrafficPolicy
     plural: globaltrafficpolicies
     shortNames:
-      - gtp
-  scope: Namespaced
\ No newline at end of file
+    - gtp
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            properties:
+              policy:
+                items:
+                  properties:
+                    dnsPrefix:
+                      type: string
+                    lbType:
+                      type: integer
+                    target:
+                      items:
+                        properties:
+                          region:
+                            type: string
+                          weight:
+                            type: integer
+                        type: object
+                      type: array
+                  type: object
+                type: array
+            type: object