Modify description for instanceType and instanceTypeRef, more instruc…

…tive and similar to TF
199201shubhamsahu · Mar 26, 2024 · 2121897 · 2121897
1 parent 035f3f7
commit 2121897
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/...ns.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml b/...ns.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml
@@ -131,7 +131,6 @@ spec:
                   The type of the instance. Possible values: [PRIMARY, READ_POOL, SECONDARY]
                 type: string
               instanceTypeRef:
-<<<<<<< HEAD
                 description: "(Required) The type of instance.\nPossible values: [\"PRIMARY\",
                   \"READ_POOL\", \"SECONDARY\"]\nFor PRIMARY and SECONDARY instances,
                   set the value to refer to the name of the associated cluster.\nThis
@@ -146,14 +145,6 @@ spec:
                   instead.\nUse deletionPolicy = \"FORCE\" in the associated secondary
                   cluster and delete the cluster forcefully to delete the secondary
                   cluster as well its associated secondary instance."
-=======
-                description: "\"(Required) The type of instance.\nPossible values:
-                  [\"PRIMARY\", \"READ_POOL\", \"SECONDARY\"]\nFor PRIMARY and SECONDARY
-                  instances, set the value to refer to the name of the associated
-                  cluster.\ninstanceTypeRef: \n  name: clusterName\nFor instance of
-                  type READ_POOL, set the value using external keyword.\nExample:\ninstanceTypeRef:\n
-                  \ external: READ_POOL\""
->>>>>>> 2ce46355a (Add KCC specific message for instanceTypeRef)
                 oneOf:
                 - not:
                     required:
@@ -380,7 +371,6 @@ spec:
                   The type of the instance. Possible values: [PRIMARY, READ_POOL, SECONDARY]
                 type: string
               instanceTypeRef:
-<<<<<<< HEAD
                 description: "(Required) The type of instance.\nPossible values: [\"PRIMARY\",
                   \"READ_POOL\", \"SECONDARY\"]\nFor PRIMARY and SECONDARY instances,
                   set the value to refer to the name of the associated cluster.\nThis
@@ -395,14 +385,6 @@ spec:
                   instead.\nUse deletionPolicy = \"FORCE\" in the associated secondary
                   cluster and delete the cluster forcefully to delete the secondary
                   cluster as well its associated secondary instance."
-=======
-                description: "\"(Required) The type of instance.\nPossible values:
-                  [\"PRIMARY\", \"READ_POOL\", \"SECONDARY\"]\nFor PRIMARY and SECONDARY
-                  instances, set the value to refer to the name of the associated
-                  cluster.\ninstanceTypeRef: \n  name: clusterName\nFor instance of
-                  type READ_POOL, set the value using external keyword.\nExample:\ninstanceTypeRef:\n
-                  \ external: READ_POOL\""
->>>>>>> 2ce46355a (Add KCC specific message for instanceTypeRef)
                 oneOf:
                 - not:
                     required: