From 5a82e34f637f70323260fc9b7d7dddf9b791d84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cz=C3=A9kus=20M=C3=A1t=C3=A9?= Date: Sun, 3 Jul 2022 11:52:19 +0200 Subject: [PATCH] Update NFS client helm chart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add alias for the original name Rename the chart Fix helm url Update info msg Signed-off-by: Czékus Máté --- README.md | 112 ++++++++++++++++++++++---------------------- cmd/apps/nfs_app.go | 31 +++++------- 2 files changed, 67 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index 6a174e8e3..0ef044e46 100644 --- a/README.md +++ b/README.md @@ -480,62 +480,62 @@ A CLI or "tool" is a command line tool that you run directly on your own worksta ### Catalog of Apps -| TOOL | DESCRIPTION | -|-------------------------|---------------------------------------------------------------------| -| mqtt-connector | Install mqtt-connector for OpenFaaS | -| waypoint | Install Waypoint | -| postgresql | Install postgresql | -| gitlab | Install GitLab | -| cassandra | Install cassandra | -| kuma | Install Kuma | -| nfs-provisioner | Install nfs client provisioner | -| nginx-inc | Install nginx-inc for OpenFaaS | -| nats-connector | Install OpenFaaS connector for NATS | -| docker-registry | Install a Docker registry | -| rabbitmq | Install rabbitmq | -| prometheus | Install Prometheus for monitoring | -| chart | Install the specified helm chart | -| linkerd | Install linkerd | -| cron-connector | Install cron-connector for OpenFaaS | -| OSM | Install osm | -| cert-manager | Install cert-manager | -| grafana | Install grafana | -| openfaas-ingress | Install openfaas ingress with TLS | -| metrics-server | Install metrics-server | -| kafka-connector | Install kafka-connector for OpenFaaS | -| openfaas | Install openfaas | -| portainer | Install portainer to visualise and manage containers | -| minio | Install minio | -| ingress-nginx | Install ingress-nginx | -| mongodb | Install mongodb | -| kube-state-metrics | Install kube-state-metrics | -| kafka | Install Confluent Platform Kafka | -| argocd | Install argocd | -| kube-image-prefetch | Install kube-image-prefetch | -| tekton | Install Tekton pipelines and dashboard | -| registry-creds | Install registry-creds | -| influxdb | Install influxdb | -| kyverno | Install Kyverno | -| kanister | Install kanister for application-level data management | -| openfaas-loki | Install Loki-OpenFaaS and Configure Loki logs provider for OpenFaaS | -| redis | Install redis | -| crossplane | Install Crossplane | -| traefik2 | Install traefik2 | -| kong-ingress | Install kong-ingress for OpenFaaS | -| consul-connect | Install Consul Service Mesh | -| kubernetes-dashboard | Install kubernetes-dashboard | -| istio | Install istio | -| inlets-operator | Install inlets-operator | -| metallb-arp | Install MetalLB in L2 (ARP) mode | -| cockroachdb | Install CockroachDB | -| docker-registry-ingress | Install registry ingress with TLS | -| jenkins | Install jenkins | -| gitea | Install gitea | -| loki | Install Loki for monitoring and tracing | -| sealed-secret | Install sealed-secrets | -| opa-gatekeeper | Install Open Policy Agent (OPA) Gatekeeper | -| falco | Install Falco | -| inlets-tcp-client | Install inlets PRO TCP client | +| TOOL | DESCRIPTION | +|---------------------------------|---------------------------------------------------------------------| +| mqtt-connector | Install mqtt-connector for OpenFaaS | +| waypoint | Install Waypoint | +| postgresql | Install postgresql | +| gitlab | Install GitLab | +| cassandra | Install cassandra | +| kuma | Install Kuma | +| nfs-subdir-external-provisioner | Install nfs client provisioner | +| nginx-inc | Install nginx-inc for OpenFaaS | +| nats-connector | Install OpenFaaS connector for NATS | +| docker-registry | Install a Docker registry | +| rabbitmq | Install rabbitmq | +| prometheus | Install Prometheus for monitoring | +| chart | Install the specified helm chart | +| linkerd | Install linkerd | +| cron-connector | Install cron-connector for OpenFaaS | +| OSM | Install osm | +| cert-manager | Install cert-manager | +| grafana | Install grafana | +| openfaas-ingress | Install openfaas ingress with TLS | +| metrics-server | Install metrics-server | +| kafka-connector | Install kafka-connector for OpenFaaS | +| openfaas | Install openfaas | +| portainer | Install portainer to visualise and manage containers | +| minio | Install minio | +| ingress-nginx | Install ingress-nginx | +| mongodb | Install mongodb | +| kube-state-metrics | Install kube-state-metrics | +| kafka | Install Confluent Platform Kafka | +| argocd | Install argocd | +| kube-image-prefetch | Install kube-image-prefetch | +| tekton | Install Tekton pipelines and dashboard | +| registry-creds | Install registry-creds | +| influxdb | Install influxdb | +| kyverno | Install Kyverno | +| kanister | Install kanister for application-level data management | +| openfaas-loki | Install Loki-OpenFaaS and Configure Loki logs provider for OpenFaaS | +| redis | Install redis | +| crossplane | Install Crossplane | +| traefik2 | Install traefik2 | +| kong-ingress | Install kong-ingress for OpenFaaS | +| consul-connect | Install Consul Service Mesh | +| kubernetes-dashboard | Install kubernetes-dashboard | +| istio | Install istio | +| inlets-operator | Install inlets-operator | +| metallb-arp | Install MetalLB in L2 (ARP) mode | +| cockroachdb | Install CockroachDB | +| docker-registry-ingress | Install registry ingress with TLS | +| jenkins | Install jenkins | +| gitea | Install gitea | +| loki | Install Loki for monitoring and tracing | +| sealed-secret | Install sealed-secrets | +| opa-gatekeeper | Install Open Policy Agent (OPA) Gatekeeper | +| falco | Install Falco | +| inlets-tcp-client | Install inlets PRO TCP client | There are 54 apps that you can install on your cluster. diff --git a/cmd/apps/nfs_app.go b/cmd/apps/nfs_app.go index 0c9249fc4..180e492ce 100644 --- a/cmd/apps/nfs_app.go +++ b/cmd/apps/nfs_app.go @@ -9,16 +9,16 @@ import ( "github.com/alexellis/arkade/pkg" "github.com/alexellis/arkade/pkg/apps" "github.com/alexellis/arkade/pkg/config" - "github.com/alexellis/arkade/pkg/k8s" "github.com/alexellis/arkade/pkg/types" "github.com/spf13/cobra" ) func MakeInstallNfsProvisioner() *cobra.Command { var nfsProvisionerApp = &cobra.Command{ - Use: "nfs-client-provisioner", - Short: "Install nfs client provisioner", - Long: "Install nfs client provisioner to create dynamic persistent volumes", + Use: "nfs-subdir-external-provisioner", + Aliases: []string{"nfs-client-provisioner", "nfs-provisioner"}, + Short: "Install nfs subdir external provisioner", + Long: "Install nfs subdir external provisioner that uses and already configured nfs to back your PVs and PVCS.", Example: "arkade install nfs-client-provisioner --nfs-server=x.x.x.x --nfs-path=/exported/path", SilenceUsage: true, } @@ -50,13 +50,6 @@ func MakeInstallNfsProvisioner() *cobra.Command { overrides["nfs.server"] = nfsServer overrides["nfs.path"] = nfsPath - arch := k8s.GetNodeArchitecture() - fmt.Printf("Node architecture: %q\n", arch) - - if suffix := getValuesSuffix(arch); suffix == "-armhf" || suffix == "-arm64" { - overrides["image.repository"] = "quay.io/external_storage/nfs-client-provisioner-arm:latest" - } - customFlags, _ := command.Flags().GetStringArray("set") if err := config.MergeFlags(overrides, customFlags); err != nil { @@ -65,8 +58,8 @@ func MakeInstallNfsProvisioner() *cobra.Command { nfsProvisionerOptions := types.DefaultInstallOptions(). WithNamespace(namespace). - WithHelmRepo("stable/nfs-client-provisioner"). - WithHelmURL("https://charts.helm.sh/stable"). + WithHelmRepo("nfs-client-provisioner/nfs-subdir-external-provisioner"). + WithHelmURL("https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/"). WithOverrides(overrides). WithKubeconfigPath(kubeConfigPath) @@ -89,9 +82,8 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: test-claim - annotations: - volume.beta.kubernetes.io/storage-class: "nfs-client" spec: + storageClassName: nfs-client accessModes: - ReadWriteMany resources: @@ -99,7 +91,7 @@ spec: storage: 1Mi EOF -# Create pod: +# Create a test pod: cat <