Skip to content

Commit bf3f3e9

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2143 from dfitzmau/OCPBUGS-42701-api
OCPBUGS-42701-api: Updated the disableMultiNetwork parameter description
2 parents 9e59a77 + 107acc7 commit bf3f3e9

12 files changed

+39
-30
lines changed

Diff for: ‎openapi/generated_openapi/zz_generated.openapi.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎openapi/openapi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30315,7 +30315,7 @@
3031530315
"type": "boolean"
3031630316
},
3031730317
"disableMultiNetwork": {
30318-
"description": "disableMultiNetwork specifies whether or not multiple pod network support should be disabled. If unset, this property defaults to 'false' and multiple network support is enabled.",
30318+
"description": "disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability. disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD, that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins, but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.",
3031930319
"type": "boolean"
3032030320
},
3032130321
"disableNetworkDiagnostics": {

Diff for: ‎operator/v1/types_network.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ type NetworkSpec struct {
7979
// +listMapKey=name
8080
AdditionalNetworks []AdditionalNetworkDefinition `json:"additionalNetworks,omitempty"`
8181

82-
// disableMultiNetwork specifies whether or not multiple pod network
83-
// support should be disabled. If unset, this property defaults to
84-
// 'false' and multiple network support is enabled.
82+
// disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
83+
// disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
84+
// that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
85+
// but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
8586
DisableMultiNetwork *bool `json:"disableMultiNetwork,omitempty"`
8687

8788
// useMultiNetworkPolicy enables a controller which allows for

Diff for: ‎operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,10 @@ spec:
659659
type: boolean
660660
disableMultiNetwork:
661661
description: |-
662-
disableMultiNetwork specifies whether or not multiple pod network
663-
support should be disabled. If unset, this property defaults to
664-
'false' and multiple network support is enabled.
662+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
663+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
664+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
665+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
665666
type: boolean
666667
disableNetworkDiagnostics:
667668
default: false

Diff for: ‎operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-Default.crd.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -643,9 +643,10 @@ spec:
643643
type: boolean
644644
disableMultiNetwork:
645645
description: |-
646-
disableMultiNetwork specifies whether or not multiple pod network
647-
support should be disabled. If unset, this property defaults to
648-
'false' and multiple network support is enabled.
646+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
647+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
648+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
649+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
649650
type: boolean
650651
disableNetworkDiagnostics:
651652
default: false

Diff for: ‎operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-DevPreviewNoUpgrade.crd.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,10 @@ spec:
659659
type: boolean
660660
disableMultiNetwork:
661661
description: |-
662-
disableMultiNetwork specifies whether or not multiple pod network
663-
support should be disabled. If unset, this property defaults to
664-
'false' and multiple network support is enabled.
662+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
663+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
664+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
665+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
665666
type: boolean
666667
disableNetworkDiagnostics:
667668
default: false

Diff for: ‎operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-TechPreviewNoUpgrade.crd.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,10 @@ spec:
659659
type: boolean
660660
disableMultiNetwork:
661661
description: |-
662-
disableMultiNetwork specifies whether or not multiple pod network
663-
support should be disabled. If unset, this property defaults to
664-
'false' and multiple network support is enabled.
662+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
663+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
664+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
665+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
665666
type: boolean
666667
disableNetworkDiagnostics:
667668
default: false

Diff for: ‎operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,10 @@ spec:
610610
type: boolean
611611
disableMultiNetwork:
612612
description: |-
613-
disableMultiNetwork specifies whether or not multiple pod network
614-
support should be disabled. If unset, this property defaults to
615-
'false' and multiple network support is enabled.
613+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
614+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
615+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
616+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
616617
type: boolean
617618
disableNetworkDiagnostics:
618619
default: false

Diff for: ‎operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AdditionalRoutingCapabilities.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -643,9 +643,10 @@ spec:
643643
type: boolean
644644
disableMultiNetwork:
645645
description: |-
646-
disableMultiNetwork specifies whether or not multiple pod network
647-
support should be disabled. If unset, this property defaults to
648-
'false' and multiple network support is enabled.
646+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
647+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
648+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
649+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
649650
type: boolean
650651
disableNetworkDiagnostics:
651652
default: false

Diff for: ‎operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/NetworkLiveMigration.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,10 @@ spec:
610610
type: boolean
611611
disableMultiNetwork:
612612
description: |-
613-
disableMultiNetwork specifies whether or not multiple pod network
614-
support should be disabled. If unset, this property defaults to
615-
'false' and multiple network support is enabled.
613+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
614+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
615+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
616+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
616617
type: boolean
617618
disableNetworkDiagnostics:
618619
default: false

Diff for: ‎operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/RouteAdvertisements.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,10 @@ spec:
626626
type: boolean
627627
disableMultiNetwork:
628628
description: |-
629-
disableMultiNetwork specifies whether or not multiple pod network
630-
support should be disabled. If unset, this property defaults to
631-
'false' and multiple network support is enabled.
629+
disableMultiNetwork defaults to 'false' and this setting enables the pod multi-networking capability.
630+
disableMultiNetwork when set to 'true' at cluster install time does not install the components, typically the Multus CNI and the network-attachment-definition CRD,
631+
that enable the pod multi-networking capability. Setting the parameter to 'true' might be useful when you need install third-party CNI plugins,
632+
but these plugins are not supported by Red Hat. Changing the parameter value as a postinstallation cluster task has no effect.
632633
type: boolean
633634
disableNetworkDiagnostics:
634635
default: false

Diff for: ‎operator/v1/zz_generated.swagger_doc_generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)