alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

chore: change missing renames of KubePrism

Browse Source 
For #7432

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev 2023-07-14 17:14:37 +03:00
parent 5f34f5b41f
commit 130518de71
No known key found for this signature in database
GPG Key ID: D3363CF894E68892
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/talosctl/cmd/mgmt/cluster/create.go
View File

@ -152,7 +152,7 @@ var (
extraBootKernelArgs string
dockerDisableIPv6 bool
controlPlanePort int
apiServerBalancerPort int
kubePrismPort int
dhcpSkipHostname bool
skipBootPhaseFinishedCheck bool
networkChaos bool
@ -523,9 +523,9 @@ func create(ctx context.Context, flags *pflag.FlagSet) (err error) {
)
}
if apiServerBalancerPort > 0 {
if kubePrismPort > 0 {
genOptions = append(genOptions,
generate.WithAPIServerBalancerPort(apiServerBalancerPort),
generate.WithKubePrismPort(kubePrismPort),
)
}
@ -1004,7 +1004,7 @@ func init() {
createCmd.Flags().StringVar(&extraBootKernelArgs, "extra-boot-kernel-args", "", "add extra kernel args to the initial boot from vmlinuz and initramfs (QEMU only)")
createCmd.Flags().BoolVar(&dockerDisableIPv6, "docker-disable-ipv6", false, "skip enabling IPv6 in containers (Docker only)")
createCmd.Flags().IntVar(&controlPlanePort, controlPlanePortFlag, constants.DefaultControlPlanePort, "control plane port (load balancer and local API port)")
createCmd.Flags().IntVar(&apiServerBalancerPort, kubePrismFlag, 0, "KubePrism port (defaults to 0 - disabled)")
createCmd.Flags().IntVar(&kubePrismPort, kubePrismFlag, 0, "KubePrism port (defaults to 0 - disabled)")
createCmd.Flags().BoolVar(&dhcpSkipHostname, "disable-dhcp-hostname", false, "skip announcing hostname via DHCP (QEMU only)")
createCmd.Flags().BoolVar(&skipBootPhaseFinishedCheck, "skip-boot-phase-finished-check", false, "skip waiting for node to finish boot phase")
createCmd.Flags().BoolVar(&networkChaos, "with-network-chaos", false, "enable to use network chaos parameters when creating a qemu cluster")

4
pkg/machinery/config/generate/init.go
View File

@ -73,10 +73,10 @@ func (in *Input) init() ([]config.Document, error) {
machine.MachineFeatures.DiskQuotaSupport = pointer.To(true)
}
if in.Options.APIServerBalancerPort > 0 {
if in.Options.KubePrismPort > 0 {
machine.MachineFeatures.KubePrismSupport = &v1alpha1.KubePrism{
ServerEnabled: pointer.To(true),
ServerPort: in.Options.APIServerBalancerPort,
ServerPort: in.Options.KubePrismPort,
}
}

8
pkg/machinery/config/generate/options.go
View File

@ -34,10 +34,10 @@ func WithLocalAPIServerPort(port int) Option {
}
}
// WithAPIServerBalancerPort specifies the local API server load balancer port. If 0, lod balancer is disabled.
func WithAPIServerBalancerPort(port int) Option {
// WithKubePrismPort specifies the KubePrism port. If 0, lod balancer is disabled.
func WithKubePrismPort(port int) Option {
return func(o *Options) error {
o.APIServerBalancerPort = port
o.KubePrismPort = port
return nil
}
@ -295,7 +295,7 @@ type Options struct {
AdditionalSubjectAltNames []string
DiscoveryEnabled *bool
APIServerBalancerPort int
KubePrismPort int
// Client options.
Roles role.Set

4
pkg/machinery/config/generate/worker.go
View File

@ -74,10 +74,10 @@ func (in *Input) worker() ([]config.Document, error) {
machine.MachineFeatures.DiskQuotaSupport = pointer.To(true)
}
if in.Options.APIServerBalancerPort > 0 {
if in.Options.KubePrismPort > 0 {
machine.MachineFeatures.KubePrismSupport = &v1alpha1.KubePrism{
ServerEnabled: pointer.To(true),
ServerPort: in.Options.APIServerBalancerPort,
ServerPort: in.Options.KubePrismPort,
}
}