fix(api): make HCP networking optional for backward compatibility

gnufied · Jul 28, 2022 · 6ef3452 · 6ef3452
1 parent 917c954
commit 6ef3452
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/api/v1alpha1/hosted_controlplane.go b/api/v1alpha1/hosted_controlplane.go
@@ -30,7 +30,9 @@ type HostedControlPlaneSpec struct {
 	IssuerURL    string                      `json:"issuerURL"`
 
 	// Networking specifies network configuration for the cluster.
-	Networking ClusterNetworking `json:"networking"`
+	// Temporarily optional for backward compatibility, required in future releases.
+	// +optional
+	Networking ClusterNetworking `json:"networking,omitempty"`
 
 	// deprecated
 	// use networking.ServiceNetwork

diff --git a/cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml b/cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml
@@ -2017,6 +2017,8 @@ spec:
                 type: string
               networking:
                 description: Networking specifies network configuration for the cluster.
+                  Temporarily optional for backward compatibility, required in future
+                  releases.
                 properties:
                   apiServer:
                     description: APIServer contains advanced network settings for
@@ -3027,7 +3029,6 @@ spec:
             - etcd
             - infraID
             - issuerURL
-            - networking
             - platform
             - pullSecret
             - releaseImage

diff --git a/docs/content/reference/api.md b/docs/content/reference/api.md
@@ -3598,7 +3598,9 @@ ClusterNetworking
 </em>
 </td>
 <td>
-<p>Networking specifies network configuration for the cluster.</p>
+<em>(Optional)</em>
+<p>Networking specifies network configuration for the cluster.
+Temporarily optional for backward compatibility, required in future releases.</p>
 </td>
 </tr>
 <tr>

diff --git a/hack/app-sre/saas_template.yaml b/hack/app-sre/saas_template.yaml
@@ -25410,7 +25410,8 @@ objects:
                   type: string
                 networking:
                   description: Networking specifies network configuration for the
-                    cluster.
+                    cluster. Temporarily optional for backward compatibility, required
+                    in future releases.
                   properties:
                     apiServer:
                       description: APIServer contains advanced network settings for
@@ -26435,7 +26436,6 @@ objects:
               - etcd
               - infraID
               - issuerURL
-              - networking
               - platform
               - pullSecret
               - releaseImage