Merge pull request #8271 from r4f4/remove-old-replaces

OCPBUGS-32292: Remove deprecated replace directives

Author: openshift-merge-bot[bot]

data/data/install.openshift.io_installconfigs.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.12.0
-  creationTimestamp: null
   name: installconfigs.install.openshift.io
 spec:
   group: install.openshift.io
@@ -2036,7 +2034,7 @@ spec:
                   properties:
                     cidr:
                       description: CIDR is the IP block address pool.
-                      type: Any
+                      type: string
                     hostPrefix:
                       description: HostPrefix is the prefix size to allocate to each
                         node from the CIDR. For example, 24 would allocate 2^8=256
@@ -2071,7 +2069,7 @@ spec:
                   properties:
                     cidr:
                       description: CIDR is the IP block address pool.
-                      type: Any
+                      type: string
                     hostPrefix:
                       description: HostPrefix is the prefix size to allocate to each
                         node from the CIDR. For example, 24 would allocate 2^8=256
@@ -2092,7 +2090,7 @@ spec:
               machineCIDR:
                 description: Deprecated way to configure an IP address pool for machines.
                   Replaced by MachineNetwork which allows for multiple pools.
-                type: Any
+                type: string
               machineNetwork:
                 description: MachineNetwork is the list of IP address pools for machines.
                   This field replaces MachineCIDR, and if set MachineCIDR must be
@@ -2106,7 +2104,7 @@ spec:
                     cidr:
                       description: CIDR is the IP block address pool for machines
                         within the cluster.
-                      type: Any
+                      type: string
                   required:
                   - cidr
                   type: object
@@ -2119,12 +2117,12 @@ spec:
               serviceCIDR:
                 description: Deprecated way to configure an IP address pool for services.
                   Replaced by ServiceNetwork which allows for multiple pools.
-                type: Any
+                type: string
               serviceNetwork:
                 description: 'ServiceNetwork is the list of IP address pools for services.
                   Default is 172.30.0.0/16. NOTE: currently only one entry is supported.'
                 items:
-                  type: Any
+                  type: string
                 maxItems: 1
                 type: array
               type:
@@ -2919,6 +2917,9 @@ spec:
                         - OpenShiftManagedDefault
                         - UserManaged
                         type: string
+                        x-kubernetes-validations:
+                        - message: type is immutable once set
+                          rule: oldSelf == '' || self == oldSelf
                     type: object
                   provisioningBridge:
                     description: Provisioning bridge is used for provisioning nodes,
@@ -2959,7 +2960,7 @@ spec:
                   provisioningNetworkCIDR:
                     description: ProvisioningNetworkCIDR defines the network to use
                       for provisioning.
-                    type: Any
+                    type: string
                   provisioningNetworkInterface:
                     description: ProvisioningNetworkInterface is the name of the network
                       interface on a control plane baremetal host that is connected
@@ -2987,6 +2988,9 @@ spec:
                       installation time. This field is solely for informational and
                       reporting purposes and is not expected to be used for decision-making.
                     type: string
+                    x-kubernetes-validations:
+                    - message: platform name cannot be changed once set
+                      rule: oldSelf == 'Unknown' || self == oldSelf
                 type: object
               gcp:
                 description: GCP is the configuration used when installing on Google
@@ -3353,6 +3357,9 @@ spec:
                             that overrides the default generated endpoint for a client.
                             This must be provided and cannot be empty.
                           type: string
+                          x-kubernetes-validations:
+                          - message: url must be a valid absolute URL
+                            rule: isURL(self)
                       required:
                       - name
                       - url
@@ -3634,6 +3641,9 @@ spec:
                         - OpenShiftManagedDefault
                         - UserManaged
                         type: string
+                        x-kubernetes-validations:
+                        - message: type is immutable once set
+                          rule: oldSelf == '' || self == oldSelf
                     type: object
                   prismCentral:
                     description: PrismCentral is the endpoint (address and port) and
@@ -3949,6 +3959,9 @@ spec:
                         - OpenShiftManagedDefault
                         - UserManaged
                         type: string
+                        x-kubernetes-validations:
+                        - message: type is immutable once set
+                          rule: oldSelf == '' || self == oldSelf
                     type: object
                   machinesSubnet:
                     description: 'DeprecatedMachinesSubnet is a string of the UUIDv4
@@ -4166,6 +4179,9 @@ spec:
                         - OpenShiftManagedDefault
                         - UserManaged
                         type: string
+                        x-kubernetes-validations:
+                        - message: type is immutable once set
+                          rule: oldSelf == '' || self == oldSelf
                     type: object
                   ovirt_cluster_id:
                     description: The target cluster under which all VMs will run
@@ -4465,6 +4481,7 @@ spec:
                                 to an instance. Specified tagIDs must use URN-notation
                                 instead of display names. A maximum of 10 tag IDs
                                 may be specified.
+                              example: urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9578:GLOBAL
                               items:
                                 type: string
                               type: array
@@ -4525,6 +4542,7 @@ spec:
                                 for example, 192.168.1.100/24. IP addresses provided
                                 via ipAddrs are intended to allow explicit assignment
                                 of a machine's IP address.
+                              example: 2001:DB8:0000:0000:244:17FF:FEB6:D37D/64
                               format: ipv6
                               items:
                                 type: string
@@ -4536,6 +4554,7 @@ spec:
                                 If DHCP is not the source of IP addresses for this
                                 network device, nameservers should include a valid
                                 nameserver.
+                              example: 8.8.8.8
                               format: ipv6
                               items:
                                 type: string
@@ -4591,6 +4610,9 @@ spec:
                         - OpenShiftManagedDefault
                         - UserManaged
                         type: string
+                        x-kubernetes-validations:
+                        - message: type is immutable once set
+                          rule: oldSelf == '' || self == oldSelf
                     type: object
                   network:
                     description: 'Network specifies the name of the network to be
@@ -4700,9 +4722,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null

go.mod

@@ -304,41 +304,16 @@ replace (
 
 replace sigs.k8s.io/cluster-api-provider-ibmcloud => sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240424062805-188d9e99702c
 
-replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.1-0.20231024080022-f1c5dd3851ce
-
-// Needed so that the InstallConfig CRD can be created. Later versions of controller-gen balk at using IPNet as a field.
-replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185
-
-replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
-
 replace github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8
 
 replace github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8
 
 replace github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20230831114549-1922eda29cf8
 
-// https://bugzilla.redhat.com/show_bug.cgi?id=2064702
-replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
-
-// https://bugzilla.redhat.com/show_bug.cgi?id=2100495
-replace golang.org/x/text => golang.org/x/text v0.3.7
-
-// https://issues.redhat.com/browse/OCPBUGS-5324
-replace gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
-
-// https://issues.redhat.com/browse/OCPBUGS-5667
-replace github.com/Masterminds/goutils => github.com/Masterminds/goutils v1.1.1
-
-// https://issues.redhat.com/browse/OCPBUGS-6422
-replace golang.org/x/net => golang.org/x/net v0.5.0
-
 // https://issues.redhat.com/browse/OCPBUGS-8119
 // https://issues.redhat.com/browse/OCPBUGS-27507
 replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.26
 
-// https://issues.redhat.com/browse/OCPBUGS-8540
-replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.2
-
 // https://issues.redhat.com/browse/OCPBUGS-30642
 replace golang.org/x/oauth2 => golang.org/x/oauth2 v0.15.0