UPSTREAM: <drop>: Generate OpenShift manifests

Author: Thirumalesh Aaraveti

openshift/infrastructure-components-openshift.yaml

@@ -1586,6 +1586,13 @@ spec:
             required:
             - instanceType
             type: object
+            x-kubernetes-validations:
+            - message: capacityReservationId may not be set when marketType is Spot
+              rule: '!has(self.capacityReservationId) || !has(self.marketType) ||
+                self.marketType != ''Spot'''
+            - message: capacityReservationId cannot be set when spotMarketOptions
+                is specified
+              rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
           status:
             description: AWSMachineStatus defines the observed state of AWSMachine.
             properties:
@@ -6189,6 +6196,14 @@ spec:
                     required:
                     - instanceType
                     type: object
+                    x-kubernetes-validations:
+                    - message: capacityReservationId may not be set when marketType
+                        is Spot
+                      rule: '!has(self.capacityReservationId) || !has(self.marketType)
+                        || self.marketType != ''Spot'''
+                    - message: capacityReservationId cannot be set when spotMarketOptions
+                        is specified
+                      rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
                 required:
                 - spec
                 type: object

openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml

@@ -1588,6 +1588,13 @@ data:
                 required:
                 - instanceType
                 type: object
+                x-kubernetes-validations:
+                - message: capacityReservationId may not be set when marketType is Spot
+                  rule: '!has(self.capacityReservationId) || !has(self.marketType) ||
+                    self.marketType != ''Spot'''
+                - message: capacityReservationId cannot be set when spotMarketOptions
+                    is specified
+                  rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
               status:
                 description: AWSMachineStatus defines the observed state of AWSMachine.
                 properties:
@@ -6191,6 +6198,14 @@ data:
                         required:
                         - instanceType
                         type: object
+                        x-kubernetes-validations:
+                        - message: capacityReservationId may not be set when marketType
+                            is Spot
+                          rule: '!has(self.capacityReservationId) || !has(self.marketType)
+                            || self.marketType != ''Spot'''
+                        - message: capacityReservationId cannot be set when spotMarketOptions
+                            is specified
+                          rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
                     required:
                     - spec
                     type: object