From 7283efd568d35e6d2c68aa2bc101a7af86db8c62 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 23 Mar 2022 23:44:49 +0300 Subject: [PATCH] chore: update the talosctl CNI download url There was hardcoded org/username. Signed-off-by: Andrey Smirnov --- cmd/talosctl/cmd/mgmt/cluster/create.go | 4 ++-- website/content/v1.0/reference/cli.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/talosctl/cmd/mgmt/cluster/create.go b/cmd/talosctl/cmd/mgmt/cluster/create.go index 97cd89676..a234c8fd7 100644 --- a/cmd/talosctl/cmd/mgmt/cluster/create.go +++ b/cmd/talosctl/cmd/mgmt/cluster/create.go @@ -843,8 +843,8 @@ func init() { createCmd.Flags().StringSliceVar(&cniBinPath, "cni-bin-path", []string{filepath.Join(defaultCNIDir, "bin")}, "search path for CNI binaries (VM only)") createCmd.Flags().StringVar(&cniConfDir, "cni-conf-dir", filepath.Join(defaultCNIDir, "conf.d"), "CNI config directory path (VM only)") createCmd.Flags().StringVar(&cniCacheDir, "cni-cache-dir", filepath.Join(defaultCNIDir, "cache"), "CNI cache directory path (VM only)") - createCmd.Flags().StringVar(&cniBundleURL, "cni-bundle-url", fmt.Sprintf("https://github.com/talos-systems/talos/releases/download/%s/talosctl-cni-bundle-%s.tar.gz", - trimVersion(version.Tag), constants.ArchVariable), "URL to download CNI bundle from (VM only)") + createCmd.Flags().StringVar(&cniBundleURL, "cni-bundle-url", fmt.Sprintf("https://github.com/%s/talos/releases/download/%s/talosctl-cni-bundle-%s.tar.gz", + images.Username, trimVersion(version.Tag), constants.ArchVariable), "URL to download CNI bundle from (VM only)") createCmd.Flags().StringVarP(&ports, "exposed-ports", "p", diff --git a/website/content/v1.0/reference/cli.md b/website/content/v1.0/reference/cli.md index a7063573e..768a44a12 100644 --- a/website/content/v1.0/reference/cli.md +++ b/website/content/v1.0/reference/cli.md @@ -91,7 +91,7 @@ talosctl cluster create [flags] --bad-rtc launch VM with bad RTC state (QEMU only) --cidr string CIDR of the cluster network (IPv4, ULA network for IPv6 is derived in automated way) (default "10.5.0.0/24") --cni-bin-path strings search path for CNI binaries (VM only) (default [/home/user/.talos/cni/bin]) - --cni-bundle-url string URL to download CNI bundle from (VM only) (default "https://github.com/talos-systems/talos/releases/download/v0.15.0-alpha.2/talosctl-cni-bundle-${ARCH}.tar.gz") + --cni-bundle-url string URL to download CNI bundle from (VM only) (default "https://github.com/siderolabs/talos/releases/download/v0.15.0-alpha.2/talosctl-cni-bundle-${ARCH}.tar.gz") --cni-cache-dir string CNI cache directory path (VM only) (default "/home/user/.talos/cni/cache") --cni-conf-dir string CNI config directory path (VM only) (default "/home/user/.talos/cni/conf.d") --config-patch stringArray patch generated machineconfigs (applied to all node types), use @file to read a patch from file