From 3a36fb5e13bcb6455e000d3e06bcfd998e9895ef Mon Sep 17 00:00:00 2001 From: Joe Bowbeer Date: Sat, 24 Jun 2023 19:43:10 -0700 Subject: [PATCH] unblock installs on arm64 nodes Signed-off-by: Joe Bowbeer --- cmd/apps/argocd_app.go | 4 ---- cmd/apps/consul_app.go | 4 ---- cmd/apps/falco.go | 4 ---- cmd/apps/gitea_app.go | 4 ---- cmd/apps/jenkins_app.go | 4 ---- cmd/apps/kube_state_metrics.go | 4 ---- cmd/apps/kyverno.go | 4 ---- cmd/apps/metallb_app.go | 11 +---------- cmd/apps/rabbitmq_app.go | 6 ------ cmd/apps/redis_app.go | 4 ---- cmd/apps/tekton_app.go | 4 ---- cmd/apps/waypoint_app.go | 4 ---- 12 files changed, 1 insertion(+), 56 deletions(-) diff --git a/cmd/apps/argocd_app.go b/cmd/apps/argocd_app.go index 8dc4013d4..a11ad5b72 100644 --- a/cmd/apps/argocd_app.go +++ b/cmd/apps/argocd_app.go @@ -33,10 +33,6 @@ func MakeInstallArgoCD() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - _, err := k8s.KubectlTask("create", "ns", "argocd") if err != nil { diff --git a/cmd/apps/consul_app.go b/cmd/apps/consul_app.go index e0392ae45..e4969fba4 100644 --- a/cmd/apps/consul_app.go +++ b/cmd/apps/consul_app.go @@ -45,10 +45,6 @@ func MakeInstallConsul() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - namespace, _ := consul.Flags().GetString("namespace") overrides := map[string]string{} diff --git a/cmd/apps/falco.go b/cmd/apps/falco.go index 8d116d4c0..28ddb01cc 100644 --- a/cmd/apps/falco.go +++ b/cmd/apps/falco.go @@ -65,10 +65,6 @@ func MakeInstallFalco() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{} if err := config.MergeFlags(overrides, customFlags); err != nil { return err diff --git a/cmd/apps/gitea_app.go b/cmd/apps/gitea_app.go index 04dd175c2..cea050432 100644 --- a/cmd/apps/gitea_app.go +++ b/cmd/apps/gitea_app.go @@ -90,10 +90,6 @@ func MakeInstallGitea() *cobra.Command { WithHelmUpdateRepo(updateRepo). WithKubeconfigPath(kubeConfigPath) - if _, found := overrides["gitea.config.database.HOST"]; !found && arch != IntelArch { - return fmt.Errorf("if installing on ARM platform you'll need to use an external database") - } - _, err = apps.MakeInstallChart(giteaAppOptions) if err != nil { return err diff --git a/cmd/apps/jenkins_app.go b/cmd/apps/jenkins_app.go index 611029604..73c83e054 100644 --- a/cmd/apps/jenkins_app.go +++ b/cmd/apps/jenkins_app.go @@ -85,10 +85,6 @@ func MakeInstallJenkins() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - jenkinsAppOptions := types.DefaultInstallOptions(). WithNamespace(ns). WithHelmRepo("jenkins/jenkins"). diff --git a/cmd/apps/kube_state_metrics.go b/cmd/apps/kube_state_metrics.go index 22bcf7ffc..8ced40a8d 100644 --- a/cmd/apps/kube_state_metrics.go +++ b/cmd/apps/kube_state_metrics.go @@ -41,10 +41,6 @@ func MakeInstallKubeStateMetrics() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - clientArch, clientOS := env.GetClientArch() fmt.Printf("Client: %q, %q\n", clientArch, clientOS) diff --git a/cmd/apps/kyverno.go b/cmd/apps/kyverno.go index e2ddb8c20..627ccc554 100644 --- a/cmd/apps/kyverno.go +++ b/cmd/apps/kyverno.go @@ -57,10 +57,6 @@ func MakeInstallKyverno() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{} if err := config.MergeFlags(overrides, customFlags); err != nil { return err diff --git a/cmd/apps/metallb_app.go b/cmd/apps/metallb_app.go index 5775bcee9..935b53a73 100644 --- a/cmd/apps/metallb_app.go +++ b/cmd/apps/metallb_app.go @@ -15,8 +15,7 @@ import ( ) const ( - MetalLBNamespaceManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.10.2/manifests/namespace.yaml" - MetalLBManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.10.2/manifests/metallb.yaml" + MetalLBManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml" ) func MakeInstallMetalLB() *cobra.Command { @@ -57,16 +56,8 @@ func MakeInstallMetalLB() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - addressRange, _ := command.Flags().GetString("address-range") - if err := k8s.Kubectl("apply", "-f", MetalLBNamespaceManifest); err != nil { - return err - } - if err := k8s.Kubectl("apply", "-f", MetalLBManifest); err != nil { return err } diff --git a/cmd/apps/rabbitmq_app.go b/cmd/apps/rabbitmq_app.go index 76c96fe00..2a201f9c2 100644 --- a/cmd/apps/rabbitmq_app.go +++ b/cmd/apps/rabbitmq_app.go @@ -9,7 +9,6 @@ import ( "github.com/alexellis/arkade/pkg" "github.com/alexellis/arkade/pkg/apps" - "github.com/alexellis/arkade/pkg/k8s" "github.com/alexellis/arkade/pkg/types" "github.com/spf13/cobra" ) @@ -60,11 +59,6 @@ func MakeInstallRabbitmq() *cobra.Command { return fmt.Errorf("error with --set usage: %s", err) } - arch := k8s.GetNodeArchitecture() - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - return nil } diff --git a/cmd/apps/redis_app.go b/cmd/apps/redis_app.go index 0f73d6544..afcc59329 100644 --- a/cmd/apps/redis_app.go +++ b/cmd/apps/redis_app.go @@ -39,10 +39,6 @@ func MakeInstallRedis() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{ "serviceAccount.create": "true", "rbac.create": "true", diff --git a/cmd/apps/tekton_app.go b/cmd/apps/tekton_app.go index 5afc69a2e..eff77fc4a 100644 --- a/cmd/apps/tekton_app.go +++ b/cmd/apps/tekton_app.go @@ -32,10 +32,6 @@ func MakeInstallTekton() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(`only Intel and AMD (i.e. PC) architecture is supported for this app`) - } - fmt.Println("Installing Tekton pipelines...") _, err := k8s.KubectlTask("apply", "-f", "https://storage.googleapis.com/tekton-releases/pipeline/latest/release.yaml") diff --git a/cmd/apps/waypoint_app.go b/cmd/apps/waypoint_app.go index 7453f05f2..b1018c878 100644 --- a/cmd/apps/waypoint_app.go +++ b/cmd/apps/waypoint_app.go @@ -35,10 +35,6 @@ func MakeInstallWaypoint() *cobra.Command { arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - namespace, _ := waypoint.Flags().GetString("namespace") overrides := map[string]string{}