Skip to content

Commit e61edbd

Browse files
FedosinFedosin
committed
Comment out IPAM and RuntimeExtension providers
Currently operator doesn't support these types, but in the future we want to add it.
1 parent f7f76f1 commit e61edbd

File tree

3 files changed

+53
-53
lines changed

3 files changed

+53
-53
lines changed

‎cmd/plugin/cmd/delete.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424
)
2525

2626
type deleteOptions struct {
27-
kubeconfig string
28-
kubeconfigContext string
29-
coreProvider string
30-
bootstrapProviders []string
31-
controlPlaneProviders []string
32-
infrastructureProviders []string
33-
ipamProviders []string
34-
runtimeExtensionProviders []string
35-
addonProviders []string
36-
includeNamespace bool
37-
includeCRDs bool
38-
deleteAll bool
27+
kubeconfig string
28+
kubeconfigContext string
29+
coreProvider string
30+
bootstrapProviders []string
31+
controlPlaneProviders []string
32+
infrastructureProviders []string
33+
// ipamProviders []string
34+
// runtimeExtensionProviders []string
35+
addonProviders []string
36+
includeNamespace bool
37+
includeCRDs bool
38+
deleteAll bool
3939
}
4040

4141
var deleteOpts = &deleteOptions{}
@@ -106,10 +106,10 @@ func init() {
106106
"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
107107
deleteCmd.Flags().StringSliceVarP(&deleteOpts.controlPlaneProviders, "control-plane", "c", nil,
108108
"ControlPlane providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
109-
deleteCmd.Flags().StringSliceVar(&deleteOpts.ipamProviders, "ipam", nil,
110-
"IPAM providers and versions (e.g. infoblox:v0.0.1) to delete from the management cluster")
111-
deleteCmd.Flags().StringSliceVar(&deleteOpts.runtimeExtensionProviders, "runtime-extension", nil,
112-
"Runtime extension providers and versions (e.g. test:v0.0.1) to delete from the management cluster")
109+
// deleteCmd.Flags().StringSliceVar(&deleteOpts.ipamProviders, "ipam", nil,
110+
// "IPAM providers and versions (e.g. infoblox:v0.0.1) to delete from the management cluster")
111+
// deleteCmd.Flags().StringSliceVar(&deleteOpts.runtimeExtensionProviders, "runtime-extension", nil,
112+
// "Runtime extension providers and versions (e.g. test:v0.0.1) to delete from the management cluster")
113113
deleteCmd.Flags().StringSliceVar(&deleteOpts.addonProviders, "addon", nil,
114114
"Add-on providers and versions (e.g. helm:v0.1.0) to delete from the management cluster")
115115

@@ -126,8 +126,8 @@ func runDelete() error {
126126
(len(deleteOpts.bootstrapProviders) > 0) ||
127127
(len(deleteOpts.controlPlaneProviders) > 0) ||
128128
(len(deleteOpts.infrastructureProviders) > 0) ||
129-
(len(deleteOpts.ipamProviders) > 0) ||
130-
(len(deleteOpts.runtimeExtensionProviders) > 0) ||
129+
// (len(deleteOpts.ipamProviders) > 0) ||
130+
// (len(deleteOpts.runtimeExtensionProviders) > 0) ||
131131
(len(deleteOpts.addonProviders) > 0)
132132

133133
if deleteOpts.deleteAll && hasProviderNames {

‎cmd/plugin/cmd/init.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ import (
2424
)
2525

2626
type initOptions struct {
27-
kubeconfig string
28-
kubeconfigContext string
29-
coreProvider string
30-
bootstrapProviders []string
31-
controlPlaneProviders []string
32-
infrastructureProviders []string
33-
ipamProviders []string
34-
runtimeExtensionProviders []string
35-
addonProviders []string
36-
targetNamespace string
37-
validate bool
38-
waitProviders bool
39-
waitProviderTimeout int
27+
kubeconfig string
28+
kubeconfigContext string
29+
coreProvider string
30+
bootstrapProviders []string
31+
controlPlaneProviders []string
32+
infrastructureProviders []string
33+
// ipamProviders []string
34+
// runtimeExtensionProviders []string
35+
addonProviders []string
36+
targetNamespace string
37+
validate bool
38+
waitProviders bool
39+
waitProviderTimeout int
4040
}
4141

4242
var initOpts = &initOptions{}
@@ -102,10 +102,10 @@ func init() {
102102
"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, Kubeadm bootstrap provider's latest release is used.")
103103
initCmd.PersistentFlags().StringSliceVarP(&initOpts.controlPlaneProviders, "control-plane", "c", nil,
104104
"Control plane providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, the Kubeadm control plane provider's latest release is used.")
105-
initCmd.PersistentFlags().StringSliceVar(&initOpts.ipamProviders, "ipam", nil,
106-
"IPAM providers and versions (e.g. infoblox:v0.0.1) to add to the management cluster.")
107-
initCmd.PersistentFlags().StringSliceVar(&initOpts.runtimeExtensionProviders, "runtime-extension", nil,
108-
"Runtime extension providers and versions (e.g. test:v0.0.1) to add to the management cluster.")
105+
// initCmd.PersistentFlags().StringSliceVar(&initOpts.ipamProviders, "ipam", nil,
106+
// "IPAM providers and versions (e.g. infoblox:v0.0.1) to add to the management cluster.")
107+
// initCmd.PersistentFlags().StringSliceVar(&initOpts.runtimeExtensionProviders, "runtime-extension", nil,
108+
// "Runtime extension providers and versions (e.g. test:v0.0.1) to add to the management cluster.")
109109
initCmd.PersistentFlags().StringSliceVar(&initOpts.addonProviders, "addon", nil,
110110
"Add-on providers and versions (e.g. helm:v0.1.0) to add to the management cluster.")
111111
initCmd.Flags().StringVarP(&initOpts.targetNamespace, "target-namespace", "n", "capi-operator-system",

‎cmd/plugin/cmd/upgrade_apply.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424
)
2525

2626
type upgradeApplyOptions struct {
27-
kubeconfig string
28-
kubeconfigContext string
29-
contract string
30-
coreProvider string
31-
bootstrapProviders []string
32-
controlPlaneProviders []string
33-
infrastructureProviders []string
34-
ipamProviders []string
35-
runtimeExtensionProviders []string
36-
addonProviders []string
37-
waitProviders bool
38-
waitProviderTimeout int
27+
kubeconfig string
28+
kubeconfigContext string
29+
contract string
30+
coreProvider string
31+
bootstrapProviders []string
32+
controlPlaneProviders []string
33+
infrastructureProviders []string
34+
// ipamProviders []string
35+
// runtimeExtensionProviders []string
36+
addonProviders []string
37+
waitProviders bool
38+
waitProviderTimeout int
3939
}
4040

4141
var upgradeApplyOpts = &upgradeApplyOptions{}
@@ -80,10 +80,10 @@ func init() {
8080
"Bootstrap providers instance and versions (e.g. kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
8181
upgradeApplyCmd.Flags().StringSliceVarP(&upgradeApplyOpts.controlPlaneProviders, "control-plane", "c", nil,
8282
"ControlPlane providers instance and versions (e.g. kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
83-
upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.ipamProviders, "ipam", nil,
84-
"IPAM providers and versions (e.g. infoblox:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
85-
upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.runtimeExtensionProviders, "runtime-extension", nil,
86-
"Runtime extension providers and versions (e.g. test:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
83+
// upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.ipamProviders, "ipam", nil,
84+
// "IPAM providers and versions (e.g. infoblox:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
85+
// upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.runtimeExtensionProviders, "runtime-extension", nil,
86+
// "Runtime extension providers and versions (e.g. test:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
8787
upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.addonProviders, "addon", nil,
8888
"Add-on providers and versions (e.g. helm:v0.1.0) to upgrade to. This flag can be used as alternative to --contract.")
8989
upgradeApplyCmd.Flags().BoolVar(&upgradeApplyOpts.waitProviders, "wait-providers", false,
@@ -99,8 +99,8 @@ func runUpgradeApply() error {
9999
(len(upgradeApplyOpts.bootstrapProviders) > 0) ||
100100
(len(upgradeApplyOpts.controlPlaneProviders) > 0) ||
101101
(len(upgradeApplyOpts.infrastructureProviders) > 0) ||
102-
(len(upgradeApplyOpts.ipamProviders) > 0) ||
103-
(len(upgradeApplyOpts.runtimeExtensionProviders) > 0) ||
102+
// (len(upgradeApplyOpts.ipamProviders) > 0) ||
103+
// (len(upgradeApplyOpts.runtimeExtensionProviders) > 0) ||
104104
(len(upgradeApplyOpts.addonProviders) > 0)
105105

106106
if upgradeApplyOpts.contract == "" && !hasProviderNames {

0 commit comments

Comments
 (0)