From 3f07bd64715536b4f8d823777416f57eb9d4f187 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 4 Sep 2020 12:46:08 +0300 Subject: [PATCH 1/5] Add arch flag to install/bootstrap --- cmd/gotk/bootstrap.go | 7 +++++-- cmd/gotk/bootstrap_github.go | 4 ++++ cmd/gotk/bootstrap_gitlab.go | 4 ++++ cmd/gotk/install.go | 23 +++++++++++++++++++---- cmd/gotk/main.go | 1 + docs/cmd/gotk_bootstrap.md | 1 + docs/cmd/gotk_bootstrap_github.md | 1 + docs/cmd/gotk_bootstrap_gitlab.md | 1 + docs/cmd/gotk_install.md | 1 + 9 files changed, 37 insertions(+), 6 deletions(-) diff --git a/cmd/gotk/bootstrap.go b/cmd/gotk/bootstrap.go index 33b2d18069..c68261aa80 100644 --- a/cmd/gotk/bootstrap.go +++ b/cmd/gotk/bootstrap.go @@ -23,7 +23,6 @@ import ( "os" "path" "path/filepath" - "sigs.k8s.io/yaml" "strings" "time" @@ -33,6 +32,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/yaml" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1" sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" @@ -49,6 +49,7 @@ var ( bootstrapComponents []string bootstrapRegistry string bootstrapImagePullSecret string + bootstrapArch string ) const ( @@ -67,6 +68,8 @@ func init() { "container registry where the toolkit images are published") bootstrapCmd.PersistentFlags().StringVar(&bootstrapImagePullSecret, "image-pull-secret", "", "Kubernetes secret name used for pulling the toolkit images from a private registry") + bootstrapCmd.PersistentFlags().StringVar(&bootstrapArch, "arch", "amd64", + "arch can be amd64 or arm64") rootCmd.AddCommand(bootstrapCmd) } @@ -78,7 +81,7 @@ func generateInstallManifests(targetPath, namespace, tmpDir string) (string, err return "", fmt.Errorf("generating manifests failed: %w", err) } - if err := genInstallManifests(bootstrapVersion, namespace, bootstrapComponents, bootstrapRegistry, bootstrapImagePullSecret, gotkDir); err != nil { + if err := genInstallManifests(bootstrapVersion, namespace, bootstrapComponents, bootstrapRegistry, bootstrapImagePullSecret, bootstrapArch, gotkDir); err != nil { return "", fmt.Errorf("generating manifests failed: %w", err) } diff --git a/cmd/gotk/bootstrap_github.go b/cmd/gotk/bootstrap_github.go index cba98cde8d..bd8b83ee22 100644 --- a/cmd/gotk/bootstrap_github.go +++ b/cmd/gotk/bootstrap_github.go @@ -93,6 +93,10 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error { return fmt.Errorf("%s environment variable not found", git.GitHubTokenName) } + if !utils.containsItemString(supportedArch, bootstrapArch) { + return fmt.Errorf("arch %s is not supported, can be %v", bootstrapArch, supportedArch) + } + repository, err := git.NewRepository(ghRepository, ghOwner, ghHostname, ghToken, "gotk", ghOwner+"@users.noreply.github.com") if err != nil { return err diff --git a/cmd/gotk/bootstrap_gitlab.go b/cmd/gotk/bootstrap_gitlab.go index 7043c786e1..cf2c8c4ff8 100644 --- a/cmd/gotk/bootstrap_gitlab.go +++ b/cmd/gotk/bootstrap_gitlab.go @@ -86,6 +86,10 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error { return fmt.Errorf("%s environment variable not found", git.GitLabTokenName) } + if !utils.containsItemString(supportedArch, bootstrapArch) { + return fmt.Errorf("arch %s is not supported, can be %v", bootstrapArch, supportedArch) + } + repository, err := git.NewRepository(glRepository, glOwner, glHostname, glToken, "gotk", glOwner+"@users.noreply.gitlab.com") if err != nil { return err diff --git a/cmd/gotk/install.go b/cmd/gotk/install.go index fe1761158a..2069609d61 100644 --- a/cmd/gotk/install.go +++ b/cmd/gotk/install.go @@ -19,7 +19,6 @@ package main import ( "context" "fmt" - "github.com/fluxcd/pkg/untar" "io/ioutil" "net/http" "os" @@ -31,6 +30,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/krusty" + + "github.com/fluxcd/pkg/untar" ) var installCmd = &cobra.Command{ @@ -61,6 +62,7 @@ var ( installComponents []string installRegistry string installImagePullSecret string + installArch string ) func init() { @@ -78,10 +80,16 @@ func init() { "container registry where the toolkit images are published") installCmd.Flags().StringVar(&installImagePullSecret, "image-pull-secret", "", "Kubernetes secret name used for pulling the toolkit images from a private registry") + installCmd.Flags().StringVar(&installArch, "arch", "amd64", + "arch can be amd64 or arm64") rootCmd.AddCommand(installCmd) } func installCmdRun(cmd *cobra.Command, args []string) error { + if !utils.containsItemString(supportedArch, installArch) { + return fmt.Errorf("arch %s is not supported, can be %v", installArch, supportedArch) + } + ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() @@ -103,7 +111,7 @@ func installCmdRun(cmd *cobra.Command, args []string) error { logger.Generatef("generating manifests") } if kustomizePath == "" { - err = genInstallManifests(installVersion, namespace, installComponents, installRegistry, installImagePullSecret, tmpDir) + err = genInstallManifests(installVersion, namespace, installComponents, installRegistry, installImagePullSecret, installArch, tmpDir) if err != nil { return fmt.Errorf("install failed: %w", err) } @@ -192,6 +200,7 @@ fieldSpecs: var kustomizationTmpl = `--- {{- $eventsAddr := .EventsAddr }} {{- $registry := .Registry }} +{{- $arch := .Arch }} apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: {{.Namespace}} @@ -231,7 +240,11 @@ patchesJson6902: images: {{- range $i, $component := .Components }} - name: fluxcd/{{$component}} +{{- if eq $arch "amd64" }} newName: {{$registry}}/{{$component}} +{{- else }} + newName: {{$registry}}/{{$component}}-{{$arch}} +{{- end }} {{- end }} {{- end }} ` @@ -253,7 +266,7 @@ spec: template: spec: nodeSelector: - kubernetes.io/arch: amd64 + kubernetes.io/arch: {{.Arch}} kubernetes.io/os: linux {{- if .ImagePullSecret }} imagePullSecrets: @@ -295,7 +308,7 @@ func downloadManifests(version string, tmpDir string) error { return nil } -func genInstallManifests(version string, namespace string, components []string, registry, imagePullSecret, tmpDir string) error { +func genInstallManifests(version string, namespace string, components []string, registry, imagePullSecret, arch, tmpDir string) error { eventsAddr := "" if utils.containsItemString(components, defaultNotification) { eventsAddr = fmt.Sprintf("http://%s/", defaultNotification) @@ -308,6 +321,7 @@ func genInstallManifests(version string, namespace string, components []string, EventsAddr string Registry string ImagePullSecret string + Arch string }{ Version: version, Namespace: namespace, @@ -315,6 +329,7 @@ func genInstallManifests(version string, namespace string, components []string, EventsAddr: eventsAddr, Registry: registry, ImagePullSecret: imagePullSecret, + Arch: arch, } if err := downloadManifests(version, tmpDir); err != nil { diff --git a/cmd/gotk/main.go b/cmd/gotk/main.go index 8ba5a45c37..cad7015be8 100644 --- a/cmd/gotk/main.go +++ b/cmd/gotk/main.go @@ -108,6 +108,7 @@ var ( defaultVersion = "latest" defaultNamespace = "gitops-system" defaultNotification = "notification-controller" + supportedArch = []string{"arm64", "amd64"} ) func init() { diff --git a/docs/cmd/gotk_bootstrap.md b/docs/cmd/gotk_bootstrap.md index aaa3f81ced..e3cf9bfab1 100644 --- a/docs/cmd/gotk_bootstrap.md +++ b/docs/cmd/gotk_bootstrap.md @@ -9,6 +9,7 @@ The bootstrap sub-commands bootstrap the toolkit components on the targeted Git ### Options ``` + --arch string arch can be amd64 or arm64 (default "amd64") --components strings list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller]) -h, --help help for bootstrap --image-pull-secret string Kubernetes secret name used for pulling the toolkit images from a private registry diff --git a/docs/cmd/gotk_bootstrap_github.md b/docs/cmd/gotk_bootstrap_github.md index 1162a0d141..947adae9c7 100644 --- a/docs/cmd/gotk_bootstrap_github.md +++ b/docs/cmd/gotk_bootstrap_github.md @@ -54,6 +54,7 @@ gotk bootstrap github [flags] ### Options inherited from parent commands ``` + --arch string arch can be amd64 or arm64 (default "amd64") --components strings list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller]) --image-pull-secret string Kubernetes secret name used for pulling the toolkit images from a private registry --kubeconfig string path to the kubeconfig file (default "~/.kube/config") diff --git a/docs/cmd/gotk_bootstrap_gitlab.md b/docs/cmd/gotk_bootstrap_gitlab.md index dda38ac1be..5b7d716589 100644 --- a/docs/cmd/gotk_bootstrap_gitlab.md +++ b/docs/cmd/gotk_bootstrap_gitlab.md @@ -51,6 +51,7 @@ gotk bootstrap gitlab [flags] ### Options inherited from parent commands ``` + --arch string arch can be amd64 or arm64 (default "amd64") --components strings list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller]) --image-pull-secret string Kubernetes secret name used for pulling the toolkit images from a private registry --kubeconfig string path to the kubeconfig file (default "~/.kube/config") diff --git a/docs/cmd/gotk_install.md b/docs/cmd/gotk_install.md index a8096fe543..16f638785c 100644 --- a/docs/cmd/gotk_install.md +++ b/docs/cmd/gotk_install.md @@ -31,6 +31,7 @@ gotk install [flags] ### Options ``` + --arch string arch can be amd64 or arm64 (default "amd64") --components strings list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller]) --dry-run only print the object that would be applied --export write the install manifests to stdout and exit From 2768926683660bdceab2a9823a75d1a53b68fe73 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 4 Sep 2020 12:54:26 +0300 Subject: [PATCH 2/5] Publish gotk linux/arm64 binary --- .goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index 44d275fb4a..cc8d13b07d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -8,6 +8,7 @@ builds: - linux goarch: - amd64 + - arm64 env: - CGO_ENABLED=0 archives: From b24727ec2271d63099fb671702caf8a085595890 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 4 Sep 2020 14:28:37 +0300 Subject: [PATCH 3/5] Update kustomize-controller to v0.0.9 --- go.mod | 2 +- go.sum | 17 ++--------------- .../kustomize-controller/kustomization.yaml | 4 ++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index af886f1462..1b9fe72113 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible github.com/fluxcd/helm-controller/api v0.0.6 - github.com/fluxcd/kustomize-controller/api v0.0.8 + github.com/fluxcd/kustomize-controller/api v0.0.9 github.com/fluxcd/pkg/git v0.0.6 github.com/fluxcd/pkg/ssh v0.0.5 github.com/fluxcd/pkg/untar v0.0.5 diff --git a/go.sum b/go.sum index fd9b36acb0..385979ce08 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fluxcd/helm-controller/api v0.0.6 h1:EpP1/cYClFrZqaw4B2mZ/qxTSDmvxJxj+VYZZR1XaTI= github.com/fluxcd/helm-controller/api v0.0.6/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= -github.com/fluxcd/kustomize-controller/api v0.0.8 h1:Yi5/MZuS2jXiRV73fuUkBCyRTuG0yx2HJTpWZaM+WHA= -github.com/fluxcd/kustomize-controller/api v0.0.8/go.mod h1:c4035rZrt2p3RExpLe64ASVEvePm7FjiY4PzHKpRJXI= +github.com/fluxcd/kustomize-controller/api v0.0.9 h1:hHhKT+YZUFgw/lWa44++8t0OO+ScXhrzn33Pt/1OJe0= +github.com/fluxcd/kustomize-controller/api v0.0.9/go.mod h1:88m3p6xY3J2pjh5OsL3ANy7PkyA93KiqAJE58JMQyoc= github.com/fluxcd/pkg/git v0.0.6 h1:4qktw8M3zj98MAs4ny6qSi36sYvTiI1czif5FqlQl4o= github.com/fluxcd/pkg/git v0.0.6/go.mod h1:9AI9yPkb2ruIcE70moVG3WhunA2/RAMJPc3rtoH8QFE= github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A= @@ -726,35 +726,24 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= -k8s.io/api v0.18.4 h1:8x49nBRxuXGUlDlwlWd3RMY1SayZrzFfxea3UZSkFw4= -k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/apiextensions-apiserver v0.18.4 h1:Y3HGERmS8t9u12YNUFoOISqefaoGRuTc43AYCLzWmWE= -k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= k8s.io/apiextensions-apiserver v0.18.8 h1:pkqYPKTHa0/3lYwH7201RpF9eFm0lmZDFBNzhN+k/sA= k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.18.4 h1:ST2beySjhqwJoIFk6p7Hp5v5O0hYY6Gngq/gUYXTPIA= -k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8= k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= -k8s.io/client-go v0.18.4 h1:un55V1Q/B3JO3A76eS0kUSywgGK/WR3BQ8fHQjNa6Zc= -k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -776,8 +765,6 @@ mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIa mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= -sigs.k8s.io/controller-runtime v0.6.1 h1:LcK2+nk0kmaOnKGN+vBcWHqY5WDJNJNB/c5pW+sU8fc= -sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A= sigs.k8s.io/controller-runtime v0.6.2 h1:jkAnfdTYBpFwlmBn3pS5HFO06SfxvnTZ1p5PeEF/zAA= sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= sigs.k8s.io/kustomize/api v0.5.1 h1:iHGTs5LcnJGqHstUSxWD/kX6XZgmd82x79LLlZwDU0I= diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml index 16d66321a7..1bd070c817 100644 --- a/manifests/bases/kustomize-controller/kustomization.yaml +++ b/manifests/bases/kustomize-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.8 -- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.8 +- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.9 +- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.9 patchesJson6902: - target: group: apps From 1b55ead16e8f3c4caa2c8f213d0717bd7eedde88 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 4 Sep 2020 15:10:42 +0300 Subject: [PATCH 4/5] Add ARM64 to install docs and script --- docs/get-started/index.md | 2 +- docs/guides/installation.md | 7 ++++++- install/gotk.sh | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/get-started/index.md b/docs/get-started/index.md index ea30e5a4dd..6c6a06f6f3 100644 --- a/docs/get-started/index.md +++ b/docs/get-started/index.md @@ -26,7 +26,7 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash ``` The install script downloads the gotk binary to `/usr/local/bin`. -Binaries for macOS and Linux AMD64 are available for download on the +Binaries for macOS and Linux AMD64/ARM64 are available for download on the [release page](https://github.com/fluxcd/toolkit/releases). To configure your shell to load gotk completions add to your bash profile: diff --git a/docs/guides/installation.md b/docs/guides/installation.md index 0bf291ced5..0db562a9bc 100644 --- a/docs/guides/installation.md +++ b/docs/guides/installation.md @@ -15,7 +15,7 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash ``` The install script downloads the gotk binary to `/usr/local/bin`. -Binaries for macOS and Linux AMD64 are available for download on the +Binaries for macOS and Linux AMD64/ARM64 are available for download on the [release page](https://github.com/fluxcd/toolkit/releases). Verify that your cluster satisfies the prerequisites with: @@ -47,6 +47,10 @@ gotk bootstrap \ --version=latest ``` +!!! hint "ARM64" + When deploying to a Kubernetes cluster with ARM 64-bit architecture, + you can use `--arch=arm64` to pull the linux/arm64 toolkit container images. + If you wish to install a specific version, use the toolkit [release tag](https://github.com/fluxcd/toolkit/releases) e.g. `--version=v0.0.14`. @@ -169,6 +173,7 @@ Generate the toolkit manifests with: ```sh gotk install --version=latest \ + --arch=amd64 \ # on ARM64/AARCH64 clusters use --arch=arm64 --export > ./my-cluster/gitops-system/toolkit-components.yaml ``` diff --git a/install/gotk.sh b/install/gotk.sh index 20fe4420d5..5d99d5e11d 100755 --- a/install/gotk.sh +++ b/install/gotk.sh @@ -42,6 +42,9 @@ setup_verify_arch() { ARCH=$(uname -m) fi case ${ARCH} in + arm64) + ARCH=arm64 + ;; amd64) ARCH=amd64 ;; From 2aa395ba12c95501b0ccadcd0af583cdfa7bf26e Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 4 Sep 2020 16:23:21 +0300 Subject: [PATCH 5/5] Update source and helm controllers helm-controller/api v0.0.7 source-controller/api v0.0.14 --- go.mod | 4 ++-- go.sum | 8 ++++---- manifests/bases/helm-controller/kustomization.yaml | 4 ++-- manifests/bases/source-controller/kustomization.yaml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 1b9fe72113..b55baaa86c 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,12 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible - github.com/fluxcd/helm-controller/api v0.0.6 + github.com/fluxcd/helm-controller/api v0.0.7 github.com/fluxcd/kustomize-controller/api v0.0.9 github.com/fluxcd/pkg/git v0.0.6 github.com/fluxcd/pkg/ssh v0.0.5 github.com/fluxcd/pkg/untar v0.0.5 - github.com/fluxcd/source-controller/api v0.0.13 + github.com/fluxcd/source-controller/api v0.0.14 github.com/manifoldco/promptui v0.7.0 github.com/spf13/cobra v1.0.0 golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect diff --git a/go.sum b/go.sum index 385979ce08..0bba00bcbd 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/helm-controller/api v0.0.6 h1:EpP1/cYClFrZqaw4B2mZ/qxTSDmvxJxj+VYZZR1XaTI= -github.com/fluxcd/helm-controller/api v0.0.6/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= +github.com/fluxcd/helm-controller/api v0.0.7 h1:aidjXvcklClH8omhYqiKswZ+MS6t8knOpUacsuESue8= +github.com/fluxcd/helm-controller/api v0.0.7/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= github.com/fluxcd/kustomize-controller/api v0.0.9 h1:hHhKT+YZUFgw/lWa44++8t0OO+ScXhrzn33Pt/1OJe0= github.com/fluxcd/kustomize-controller/api v0.0.9/go.mod h1:88m3p6xY3J2pjh5OsL3ANy7PkyA93KiqAJE58JMQyoc= github.com/fluxcd/pkg/git v0.0.6 h1:4qktw8M3zj98MAs4ny6qSi36sYvTiI1czif5FqlQl4o= @@ -121,8 +121,8 @@ github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A= github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs= github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk= github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= -github.com/fluxcd/source-controller/api v0.0.13 h1:rf0uZ20OAN+yJVs0uHJUhw3n3ci9ZyjaLqt5Jt/5K9A= -github.com/fluxcd/source-controller/api v0.0.13/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE= +github.com/fluxcd/source-controller/api v0.0.14 h1:iNG6AGnr44z4T6F0JC2M82ekyxzJ29c3m+DVC7FwSHQ= +github.com/fluxcd/source-controller/api v0.0.14/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index 55a8e7326f..fc628d8e01 100644 --- a/manifests/bases/helm-controller/kustomization.yaml +++ b/manifests/bases/helm-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.6 -- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.6 +- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.7 +- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.7 patchesJson6902: - target: group: apps diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 956bb63a5a..6b0c53a146 100644 --- a/manifests/bases/source-controller/kustomization.yaml +++ b/manifests/bases/source-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/source-controller/config//crd?ref=v0.0.13 -- github.com/fluxcd/source-controller/config//manager?ref=v0.0.13 +- github.com/fluxcd/source-controller/config//crd?ref=v0.0.14 +- github.com/fluxcd/source-controller/config//manager?ref=v0.0.14 patchesJson6902: - target: group: apps