Skip to content

Commit 25c12fc

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#8271 from r4f4/remove-old-replaces
OCPBUGS-32292: Remove deprecated replace directives
2 parents 65b89ed + 6d52bba commit 25c12fc

File tree

286 files changed

+28377
-7363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+28377
-7363
lines changed

‎data/data/install.openshift.io_installconfigs.yaml‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
76
controller-gen.kubebuilder.io/version: v0.12.0
8-
creationTimestamp: null
97
name: installconfigs.install.openshift.io
108
spec:
119
group: install.openshift.io
@@ -2036,7 +2034,7 @@ spec:
20362034
properties:
20372035
cidr:
20382036
description: CIDR is the IP block address pool.
2039-
type: Any
2037+
type: string
20402038
hostPrefix:
20412039
description: HostPrefix is the prefix size to allocate to each
20422040
node from the CIDR. For example, 24 would allocate 2^8=256
@@ -2071,7 +2069,7 @@ spec:
20712069
properties:
20722070
cidr:
20732071
description: CIDR is the IP block address pool.
2074-
type: Any
2072+
type: string
20752073
hostPrefix:
20762074
description: HostPrefix is the prefix size to allocate to each
20772075
node from the CIDR. For example, 24 would allocate 2^8=256
@@ -2092,7 +2090,7 @@ spec:
20922090
machineCIDR:
20932091
description: Deprecated way to configure an IP address pool for machines.
20942092
Replaced by MachineNetwork which allows for multiple pools.
2095-
type: Any
2093+
type: string
20962094
machineNetwork:
20972095
description: MachineNetwork is the list of IP address pools for machines.
20982096
This field replaces MachineCIDR, and if set MachineCIDR must be
@@ -2106,7 +2104,7 @@ spec:
21062104
cidr:
21072105
description: CIDR is the IP block address pool for machines
21082106
within the cluster.
2109-
type: Any
2107+
type: string
21102108
required:
21112109
- cidr
21122110
type: object
@@ -2119,12 +2117,12 @@ spec:
21192117
serviceCIDR:
21202118
description: Deprecated way to configure an IP address pool for services.
21212119
Replaced by ServiceNetwork which allows for multiple pools.
2122-
type: Any
2120+
type: string
21232121
serviceNetwork:
21242122
description: 'ServiceNetwork is the list of IP address pools for services.
21252123
Default is 172.30.0.0/16. NOTE: currently only one entry is supported.'
21262124
items:
2127-
type: Any
2125+
type: string
21282126
maxItems: 1
21292127
type: array
21302128
type:
@@ -2919,6 +2917,9 @@ spec:
29192917
- OpenShiftManagedDefault
29202918
- UserManaged
29212919
type: string
2920+
x-kubernetes-validations:
2921+
- message: type is immutable once set
2922+
rule: oldSelf == '' || self == oldSelf
29222923
type: object
29232924
provisioningBridge:
29242925
description: Provisioning bridge is used for provisioning nodes,
@@ -2959,7 +2960,7 @@ spec:
29592960
provisioningNetworkCIDR:
29602961
description: ProvisioningNetworkCIDR defines the network to use
29612962
for provisioning.
2962-
type: Any
2963+
type: string
29632964
provisioningNetworkInterface:
29642965
description: ProvisioningNetworkInterface is the name of the network
29652966
interface on a control plane baremetal host that is connected
@@ -2987,6 +2988,9 @@ spec:
29872988
installation time. This field is solely for informational and
29882989
reporting purposes and is not expected to be used for decision-making.
29892990
type: string
2991+
x-kubernetes-validations:
2992+
- message: platform name cannot be changed once set
2993+
rule: oldSelf == 'Unknown' || self == oldSelf
29902994
type: object
29912995
gcp:
29922996
description: GCP is the configuration used when installing on Google
@@ -3353,6 +3357,9 @@ spec:
33533357
that overrides the default generated endpoint for a client.
33543358
This must be provided and cannot be empty.
33553359
type: string
3360+
x-kubernetes-validations:
3361+
- message: url must be a valid absolute URL
3362+
rule: isURL(self)
33563363
required:
33573364
- name
33583365
- url
@@ -3634,6 +3641,9 @@ spec:
36343641
- OpenShiftManagedDefault
36353642
- UserManaged
36363643
type: string
3644+
x-kubernetes-validations:
3645+
- message: type is immutable once set
3646+
rule: oldSelf == '' || self == oldSelf
36373647
type: object
36383648
prismCentral:
36393649
description: PrismCentral is the endpoint (address and port) and
@@ -3949,6 +3959,9 @@ spec:
39493959
- OpenShiftManagedDefault
39503960
- UserManaged
39513961
type: string
3962+
x-kubernetes-validations:
3963+
- message: type is immutable once set
3964+
rule: oldSelf == '' || self == oldSelf
39523965
type: object
39533966
machinesSubnet:
39543967
description: 'DeprecatedMachinesSubnet is a string of the UUIDv4
@@ -4166,6 +4179,9 @@ spec:
41664179
- OpenShiftManagedDefault
41674180
- UserManaged
41684181
type: string
4182+
x-kubernetes-validations:
4183+
- message: type is immutable once set
4184+
rule: oldSelf == '' || self == oldSelf
41694185
type: object
41704186
ovirt_cluster_id:
41714187
description: The target cluster under which all VMs will run
@@ -4465,6 +4481,7 @@ spec:
44654481
to an instance. Specified tagIDs must use URN-notation
44664482
instead of display names. A maximum of 10 tag IDs
44674483
may be specified.
4484+
example: urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9578:GLOBAL
44684485
items:
44694486
type: string
44704487
type: array
@@ -4525,6 +4542,7 @@ spec:
45254542
for example, 192.168.1.100/24. IP addresses provided
45264543
via ipAddrs are intended to allow explicit assignment
45274544
of a machine's IP address.
4545+
example: 2001:DB8:0000:0000:244:17FF:FEB6:D37D/64
45284546
format: ipv6
45294547
items:
45304548
type: string
@@ -4536,6 +4554,7 @@ spec:
45364554
If DHCP is not the source of IP addresses for this
45374555
network device, nameservers should include a valid
45384556
nameserver.
4557+
example: 8.8.8.8
45394558
format: ipv6
45404559
items:
45414560
type: string
@@ -4591,6 +4610,9 @@ spec:
45914610
- OpenShiftManagedDefault
45924611
- UserManaged
45934612
type: string
4613+
x-kubernetes-validations:
4614+
- message: type is immutable once set
4615+
rule: oldSelf == '' || self == oldSelf
45944616
type: object
45954617
network:
45964618
description: 'Network specifies the name of the network to be
@@ -4700,9 +4722,3 @@ spec:
47004722
type: object
47014723
served: true
47024724
storage: true
4703-
status:
4704-
acceptedNames:
4705-
kind: ""
4706-
plural: ""
4707-
conditions: null
4708-
storedVersions: null

‎go.mod‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -304,41 +304,16 @@ replace (
304304

305305
replace sigs.k8s.io/cluster-api-provider-ibmcloud => sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240424062805-188d9e99702c
306306

307-
replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.1-0.20231024080022-f1c5dd3851ce
308-
309-
// Needed so that the InstallConfig CRD can be created. Later versions of controller-gen balk at using IPNet as a field.
310-
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185
311-
312-
replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
313-
314307
replace github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8
315308

316309
replace github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8
317310

318311
replace github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20230831114549-1922eda29cf8
319312

320-
// https://bugzilla.redhat.com/show_bug.cgi?id=2064702
321-
replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
322-
323-
// https://bugzilla.redhat.com/show_bug.cgi?id=2100495
324-
replace golang.org/x/text => golang.org/x/text v0.3.7
325-
326-
// https://issues.redhat.com/browse/OCPBUGS-5324
327-
replace gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
328-
329-
// https://issues.redhat.com/browse/OCPBUGS-5667
330-
replace github.com/Masterminds/goutils => github.com/Masterminds/goutils v1.1.1
331-
332-
// https://issues.redhat.com/browse/OCPBUGS-6422
333-
replace golang.org/x/net => golang.org/x/net v0.5.0
334-
335313
// https://issues.redhat.com/browse/OCPBUGS-8119
336314
// https://issues.redhat.com/browse/OCPBUGS-27507
337315
replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.26
338316

339-
// https://issues.redhat.com/browse/OCPBUGS-8540
340-
replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.2
341-
342317
// https://issues.redhat.com/browse/OCPBUGS-30642
343318
replace golang.org/x/oauth2 => golang.org/x/oauth2 v0.15.0
344319

0 commit comments

Comments
 (0)