Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions data/data/install.openshift.io_installconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5348,7 +5348,6 @@ spec:
items:
type: string
type: array
uniqueItems: true
apiVIP:
description: |-
DeprecatedAPIVIP is the VIP to use for internal API communication
Expand All @@ -5365,7 +5364,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
bootstrapExternalStaticDNS:
description: |-
BootstrapExternalStaticDNS is the static network DNS of the bootstrap node.
Expand Down Expand Up @@ -5547,7 +5545,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
libvirtURI:
default: qemu:///system
description: |-
Expand Down Expand Up @@ -6125,7 +6122,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
clusterOSImage:
description: ClusterOSImage overrides the url provided in rhcos.json
to download the RHCOS Image.
Expand Down Expand Up @@ -6513,7 +6509,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
loadBalancer:
description: |-
LoadBalancer defines how the load balancer used by the cluster is configured.
Expand Down Expand Up @@ -6663,7 +6658,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
cloud:
description: Cloud is the name of OpenStack cloud to use from
clouds.yaml.
Expand Down Expand Up @@ -6839,7 +6833,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
lbFloatingIP:
description: |-
LbFloatingIP is the IP address of an available floating IP in your OpenStack cluster
Expand Down Expand Up @@ -6942,7 +6935,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
defaultMachinePlatform:
description: |-
DefaultMachinePlatform is the default configuration used when
Expand Down Expand Up @@ -7066,7 +7058,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
loadBalancer:
description: |-
LoadBalancer defines how the load balancer used by the cluster is configured.
Expand Down Expand Up @@ -7277,7 +7268,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
cluster:
description: |-
Cluster is the name of the cluster virtual machines will be cloned into.
Expand Down Expand Up @@ -7625,7 +7615,6 @@ spec:
type: string
maxItems: 2
type: array
uniqueItems: true
loadBalancer:
description: |-
LoadBalancer defines how the load balancer used by the cluster is configured.
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ require (
k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
k8s.io/cloud-provider-vsphere v1.31.0
k8s.io/code-generator v0.34.1
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
Expand Down Expand Up @@ -347,6 +348,7 @@ require (
k8s.io/cli-runtime v0.33.4 // indirect
k8s.io/cluster-bootstrap v0.33.3 // indirect
k8s.io/component-base v0.34.1 // indirect
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/kubectl v0.33.4 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1172,10 +1172,14 @@ k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
k8s.io/cluster-bootstrap v0.33.3 h1:u2NTxJ5CFSBFXaDxLQoOWMly8eni31psVso+caq6uwI=
k8s.io/cluster-bootstrap v0.33.3/go.mod h1:p970f8u8jf273zyQ5raD8WUu2XyAl0SAWOY82o7i/ds=
k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
k8s.io/code-generator v0.34.1 h1:WpphT26E+j7tEgIUfFr5WfbJrktCGzB3JoJH9149xYc=
k8s.io/code-generator v0.34.1/go.mod h1:DeWjekbDnJWRwpw3s0Jat87c+e0TgkxoR4ar608yqvg=
k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
Expand Down
19 changes: 19 additions & 0 deletions pkg/ipnet/ipnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,22 @@ func MustParseCIDR(s string) *IPNet {
}
return cidr
}

// DeepCopyInto copies the receiver into out. out must be non-nil.
func (ipnet *IPNet) DeepCopyInto(out *IPNet) {
if ipnet == nil {
*out = IPNet{}
} else {
*out = *ipnet
}
}

// DeepCopy copies the receiver, creating a new IPNet.
func (ipnet *IPNet) DeepCopy() *IPNet {
if ipnet == nil {
return nil
}
out := new(IPNet)
ipnet.DeepCopyInto(out)
return out
}
33 changes: 33 additions & 0 deletions pkg/ipnet/ipnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,36 @@ func TestUnmarshal(t *testing.T) {
})
}
}

func TestDeepCopy(t *testing.T) {
for _, ipNetIn := range []*IPNet{
{},
{IPNet: net.IPNet{
IP: net.IP{192, 168, 0, 10},
Mask: net.IPv4Mask(255, 255, 255, 0),
}},
} {
t.Run(ipNetIn.String(), func(t *testing.T) {
t.Run("DeepCopyInto", func(t *testing.T) {
ipNetOut := &IPNet{}
ipNetIn.DeepCopyInto(ipNetOut)
if ipNetOut.String() != ipNetIn.String() {
t.Fatalf("%v != %v", ipNetOut, ipNetIn)
}
if ipNetOut == ipNetIn {
t.Fatalf("DeepCopyInto did not deep copy (pointers are equal)")
}
})

t.Run("DeepCopy", func(t *testing.T) {
ipNetOut := ipNetIn.DeepCopy()
if ipNetOut.String() != ipNetIn.String() {
t.Fatalf("%v != %v", ipNetOut, ipNetIn)
}
if ipNetOut == ipNetIn {
t.Fatalf("DeepCopy did not deep copy (pointers are equal)")
}
})
})
}
}
1 change: 1 addition & 0 deletions pkg/types/aws/doc.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Package aws contains AWS-specific structures for installer
// configuration and management.
// +k8s:deepcopy-gen=package
package aws

// Name is name for the AWS platform.
Expand Down
Loading