From a881369c0060c705984d5663c6ab4cfd25880295 Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Thu, 19 Sep 2024 16:21:47 +0200 Subject: [PATCH 1/6] Add nfs-server-provisioner Helm chart --- charts/README.md | 5 ++- charts/nfs-server-provisioner/Chart.lock | 6 +++ charts/nfs-server-provisioner/Chart.yaml | 14 +++++++ charts/nfs-server-provisioner/README.md | 46 +++++++++++++++++++++++ charts/nfs-server-provisioner/values.yaml | 7 ++++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 charts/nfs-server-provisioner/Chart.lock create mode 100644 charts/nfs-server-provisioner/Chart.yaml create mode 100644 charts/nfs-server-provisioner/README.md create mode 100644 charts/nfs-server-provisioner/values.yaml diff --git a/charts/README.md b/charts/README.md index d3e8ca9..e2ad1d7 100644 --- a/charts/README.md +++ b/charts/README.md @@ -6,6 +6,7 @@ * [Game 2048](game-2048/README.md) * [Let's Encrypt](letsencrypt/README.md) * [NFS-Ganesha](nfs-ganesha/README.md) +* [NFS Server Provisioner](nfs-server-provisioner/README.md) * [Rancher Cluster Template](rancher-cluster-templates/README.md) * [WordPress](wordpress/README.md) @@ -22,6 +23,6 @@ helm template . -f values.yaml -f values_mine.yaml --namespace dem # installs a chart from local source helm upgrade --install . -f values.yaml \ -# --debug > output.yaml \ ---create-namespace --namespace nfs-ganesha + # --debug > output.yaml \ + --create-namespace --namespace nfs-ganesha ``` diff --git a/charts/nfs-server-provisioner/Chart.lock b/charts/nfs-server-provisioner/Chart.lock new file mode 100644 index 0000000..9c1f219 --- /dev/null +++ b/charts/nfs-server-provisioner/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: nfs-server-provisioner + repository: https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/ + version: 1.8.0 +digest: sha256:17d02ec93947c92806da70bda22b675ce7001873b0a68cb908b9714256704503 +generated: "2024-09-19T16:06:10.718178856+02:00" diff --git a/charts/nfs-server-provisioner/Chart.yaml b/charts/nfs-server-provisioner/Chart.yaml new file mode 100644 index 0000000..74fbf94 --- /dev/null +++ b/charts/nfs-server-provisioner/Chart.yaml @@ -0,0 +1,14 @@ +apiVersion: v2 +name: nfs-server-provisioner +description: Helm chart for managing WordPress +type: application +version: 0.1.0 +appVersion: "4.0.8" +dependencies: + - name: nfs-server-provisioner + version: 1.8.0 + repository: https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/ +home: https://github.com/SUSE/lab-setup/tree/main/charts/nfs-server-provisioner +maintainers: + - name: devpro + email: bertrand.thomas@suse.com diff --git a/charts/nfs-server-provisioner/README.md b/charts/nfs-server-provisioner/README.md new file mode 100644 index 0000000..3817463 --- /dev/null +++ b/charts/nfs-server-provisioner/README.md @@ -0,0 +1,46 @@ +# NFS server provisioner + +This Helm chart will install [NFS Server Provisioner](https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner) in a Kubernetes cluster. + +## Quick start + +Install the application with the default settings: + +```bash +# adds the repo +helm repo add suse-lab-setup https://opensource.suse.com/lab-setup +helm repo update + +# installs the chart +helm upgrade --install nfs-server-provisioner suse-lab-setup/nfs-server-provisioner --namespace nfs-provisioner --create-namespace +``` + +Look at [values.yaml](values.yaml) for the configuration. + +Clean-up: + +```bash +helm delete nfs-server-provisioner +kubectl delete ns nfs-provisioner +``` + +## Upstream version update + +- Look for the available versions: + +```bash +# adds bitnami helm chart repository +helm repo add nfs-ganesha-server-and-external-provisioner https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/ +helm repo update + +# lists available charts +helm search repo nfs-server-provisioner +``` + +- Update [Chart.yaml](Chart.yaml) + +- Update Chart.lock file: + +```bash +helm dependency update +``` diff --git a/charts/nfs-server-provisioner/values.yaml b/charts/nfs-server-provisioner/values.yaml new file mode 100644 index 0000000..8c19719 --- /dev/null +++ b/charts/nfs-server-provisioner/values.yaml @@ -0,0 +1,7 @@ +# refers to https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner/blob/master/charts/nfs-server-provisioner/values.yaml +nfs-server-provisioner: + storageClass: + defaultClass: true + mountOptions: + - vers=3 + - nolock From 35d48e840dfbb73397975f2cc1d393b4e84b82a6 Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Thu, 19 Sep 2024 16:22:13 +0200 Subject: [PATCH 2/6] Add recent functions in README & fix file name --- scripts/README.md | 44 ++++++++++++------- .../observability/{api_key.sh => api-key.sh} | 0 2 files changed, 27 insertions(+), 17 deletions(-) rename scripts/observability/{api_key.sh => api-key.sh} (100%) diff --git a/scripts/README.md b/scripts/README.md index 76bd98e..48f6e65 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -3,23 +3,33 @@ ## Bash functions Name | Source ------------------------------------------------|--------------------------------------------------------------------------------------------- -`k3s_copy_kubeconfig` | [scripts/k3s/cluster-lifecycle.sh](scripts/k3s/cluster-lifecycle.sh) -`k3s_create_cluster` | [scripts/k3s/cluster-lifecycle.sh](scripts/k3s/cluster-lifecycle.sh) -`k8s_create_letsencryptclusterissuer` | [scripts/kubernetes/certificate-management.sh](scripts/kubernetes/certificate-management.sh) -`k8s_install_certmanager` | [scripts/kubernetes/certificate-management.sh](scripts/kubernetes/certificate-management.sh) -`k8s_wait_fornodesandpods` | [scripts/kubernetes/cluster-status.sh](scripts/kubernetes/cluster-status.sh) -`rancher_create_apikey` | [scripts/rancher/user-actions.sh](scripts/rancher/user-actions.sh) -`rancher_create_customcluster` | [scripts/rancher/cluster-actions.sh](scripts/rancher/cluster-actions.sh) -`rancher_first_login` | [scripts/rancher/manager-lifecycle.sh](scripts/rancher/manager-lifecycle.sh) -`rancher_get_clusterid` | [scripts/rancher/cluster-actions.sh](scripts/rancher/cluster-actions.sh) -`rancher_get_clusterregistrationcommand` | [scripts/rancher/cluster-actions.sh](scripts/rancher/cluster-actions.sh) -`rancher_install_withcertmanagerclusterissuer` | [scripts/rancher/manager-lifecycle.sh](scripts/rancher/manager-lifecycle.sh) -`rancher_list_clusters` | [scripts/rancher/cluster-actions.sh](scripts/rancher/cluster-actions.sh) -`rancher_login_withpassword` | [scripts/rancher/user-actions.sh](scripts/rancher/user-actions.sh) -`rancher_update_password` | [scripts/rancher/user-actions.sh](scripts/rancher/user-actions.sh) -`rancher_update_serverurl` | [scripts/rancher/manager-settings.sh](scripts/rancher/manager-settings.sh) -`rancher_wait_capiready` | [scripts/rancher/manager-lifecycle.sh](scripts/rancher/manager-lifecycle.sh) +-----------------------------------------------|----------------------------------------------------------------------------- +`k3s_copy_kubeconfig` | [k3s/cluster-lifecycle.sh](k3s/cluster-lifecycle.sh) +`k3s_create_cluster` | [k3s/cluster-lifecycle.sh](k3s/cluster-lifecycle.sh) +`k8s_create_letsencryptclusterissuer` | [kubernetes/certificate-management.sh](kubernetes/certificate-management.sh) +`k8s_install_certmanager` | [kubernetes/certificate-management.sh](kubernetes/certificate-management.sh) +`k8s_wait_fornodesandpods` | [kubernetes/cluster-status.sh](kubernetes/cluster-status.sh) +`keycloak_login` | [authentication/keycloak.sh](authentication/keycloak.sh) +`keycloak_create_user` | [authentication/keycloak.sh](authentication/keycloak.sh) +`keycloak_delete_user` | [authentication/keycloak.sh](authentication/keycloak.sh) +`observability_check_stackpack` | [observability/stackpack.sh](observability/stackpack.sh) +`observability_create_ingestion_api_key` | [observability/api-key.sh](observability/api-key.sh) +`observability_delete_ingestion_api_key` | [observability/api-key.sh](observability/api-key.sh) +`observability_delete_stackpack` | [observability/stackpack.sh](observability/stackpack.sh) +`observability_get_component_snapshot` | [observability/stql.sh](observability/stql.sh) +`observability_get_component_state` | [observability/stql.sh](observability/stql.sh) +`observability_install_cli` | [observability/cli.sh](observability/cli.sh) +`rancher_create_apikey` | [rancher/user-actions.sh](rancher/user-actions.sh) +`rancher_create_customcluster` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) +`rancher_first_login` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) +`rancher_get_clusterid` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) +`rancher_get_clusterregistrationcommand` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) +`rancher_install_withcertmanagerclusterissuer` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) +`rancher_list_clusters` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) +`rancher_login_withpassword` | [rancher/user-actions.sh](rancher/user-actions.sh) +`rancher_update_password` | [rancher/user-actions.sh](rancher/user-actions.sh) +`rancher_update_serverurl` | [rancher/manager-settings.sh](rancher/manager-settings.sh) +`rancher_wait_capiready` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) ## Concrete examples diff --git a/scripts/observability/api_key.sh b/scripts/observability/api-key.sh similarity index 100% rename from scripts/observability/api_key.sh rename to scripts/observability/api-key.sh From 34d8d30266fcb76a34c374d6fc6cc3709965e43b Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Thu, 19 Sep 2024 16:22:22 +0200 Subject: [PATCH 3/6] Fix typo in WordPress word --- charts/wordpress/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md index 2336abf..7ffbcab 100644 --- a/charts/wordpress/README.md +++ b/charts/wordpress/README.md @@ -36,7 +36,7 @@ wordpress: global: storageClass: azureblob-fuse wordpressUsername: myuser - wordpressBlogName: "My Wordpress!" + wordpressBlogName: "My WordPress!" existingSecret: wordpress-credentials ingress: enabled: true From 694e4d9f2725e899af039074bd12c7346a034962 Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Thu, 19 Sep 2024 16:24:12 +0200 Subject: [PATCH 4/6] Upgrade WordPress chart to latest from upstream --- charts/wordpress/Chart.lock | 6 +++--- charts/wordpress/Chart.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/wordpress/Chart.lock b/charts/wordpress/Chart.lock index 2ad15f3..0c6e1eb 100644 --- a/charts/wordpress/Chart.lock +++ b/charts/wordpress/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: wordpress repository: https://charts.bitnami.com/bitnami - version: 19.2.5 -digest: sha256:9ecd8b6020982dfb58440e219ed45aadb2856be4c8719b94b364f85fc079e557 -generated: "2024-09-04T14:30:06.1580989+02:00" + version: 23.1.15 +digest: sha256:75e86638c376cf1a29ffe65dd2d723e30201f21964d90b39d35a73f40c3f3e7e +generated: "2024-09-19T16:23:42.643837319+02:00" diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml index 70cdc9c..94abb20 100644 --- a/charts/wordpress/Chart.yaml +++ b/charts/wordpress/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: wordpress description: Helm chart for managing WordPress type: application -version: 0.1.1 -appVersion: "6.4.3" +version: 0.1.2 +appVersion: "6.6.2" dependencies: - name: wordpress - version: 19.2.5 + version: 23.1.15 repository: https://charts.bitnami.com/bitnami home: https://github.com/SUSE/lab-setup/tree/main/charts/wordpress maintainers: From 47ef741112bcdb154d0d56954781a1bbab9af2df Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Thu, 19 Sep 2024 16:27:07 +0200 Subject: [PATCH 5/6] Add upstream Helm repo --- .github/workflows/ci.yml | 1 + .github/workflows/pkg.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53553aa..22595ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,7 @@ jobs: - name: Add dependency Helm chart repositories run: | helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add nfs-ganesha-server-and-external-provisioner https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/ helm repo update - name: Install Python uses: actions/setup-python@v5 diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 670ab0d..8afe998 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -48,6 +48,7 @@ jobs: - name: Add dependency Helm chart repositories run: | helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add nfs-ganesha-server-and-external-provisioner https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/ helm repo update - name: Host charts repository on GitHub Pages uses: helm/chart-releaser-action@v1.6.0 From 9c7817b1120735e59f6740ad665bb4870df0317a Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Fri, 20 Sep 2024 11:18:04 +0200 Subject: [PATCH 6/6] Rename scripts following convention --- scripts/README.md | 36 +++++++++---------- ...ster-lifecycle.sh => cluster_lifecycle.sh} | 0 ...anagement.sh => certificate_management.sh} | 0 .../{cluster-status.sh => cluster_status.sh} | 0 .../observability/{api-key.sh => api_key.sh} | 0 ...{cluster-actions.sh => cluster_actions.sh} | 0 ...ager-lifecycle.sh => manager_lifecycle.sh} | 0 ...anager-settings.sh => manager_settings.sh} | 0 .../{user-actions.sh => user_actions.sh} | 0 9 files changed, 18 insertions(+), 18 deletions(-) rename scripts/k3s/{cluster-lifecycle.sh => cluster_lifecycle.sh} (100%) rename scripts/kubernetes/{certificate-management.sh => certificate_management.sh} (100%) rename scripts/kubernetes/{cluster-status.sh => cluster_status.sh} (100%) rename scripts/observability/{api-key.sh => api_key.sh} (100%) rename scripts/rancher/{cluster-actions.sh => cluster_actions.sh} (100%) rename scripts/rancher/{manager-lifecycle.sh => manager_lifecycle.sh} (100%) rename scripts/rancher/{manager-settings.sh => manager_settings.sh} (100%) rename scripts/rancher/{user-actions.sh => user_actions.sh} (100%) diff --git a/scripts/README.md b/scripts/README.md index 48f6e65..428b779 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,32 +4,32 @@ Name | Source -----------------------------------------------|----------------------------------------------------------------------------- -`k3s_copy_kubeconfig` | [k3s/cluster-lifecycle.sh](k3s/cluster-lifecycle.sh) -`k3s_create_cluster` | [k3s/cluster-lifecycle.sh](k3s/cluster-lifecycle.sh) -`k8s_create_letsencryptclusterissuer` | [kubernetes/certificate-management.sh](kubernetes/certificate-management.sh) -`k8s_install_certmanager` | [kubernetes/certificate-management.sh](kubernetes/certificate-management.sh) -`k8s_wait_fornodesandpods` | [kubernetes/cluster-status.sh](kubernetes/cluster-status.sh) +`k3s_copy_kubeconfig` | [k3s/cluster_lifecycle.sh](k3s/cluster_lifecycle.sh) +`k3s_create_cluster` | [k3s/cluster_lifecycle.sh](k3s/cluster_lifecycle.sh) +`k8s_create_letsencryptclusterissuer` | [kubernetes/certificate_management.sh](kubernetes/certificate_management.sh) +`k8s_install_certmanager` | [kubernetes/certificate_management.sh](kubernetes/certificate_management.sh) +`k8s_wait_fornodesandpods` | [kubernetes/cluster_status.sh](kubernetes/cluster_status.sh) `keycloak_login` | [authentication/keycloak.sh](authentication/keycloak.sh) `keycloak_create_user` | [authentication/keycloak.sh](authentication/keycloak.sh) `keycloak_delete_user` | [authentication/keycloak.sh](authentication/keycloak.sh) `observability_check_stackpack` | [observability/stackpack.sh](observability/stackpack.sh) -`observability_create_ingestion_api_key` | [observability/api-key.sh](observability/api-key.sh) -`observability_delete_ingestion_api_key` | [observability/api-key.sh](observability/api-key.sh) +`observability_create_ingestion_api_key` | [observability/api_key.sh](observability/api_key.sh) +`observability_delete_ingestion_api_key` | [observability/api_key.sh](observability/api_key.sh) `observability_delete_stackpack` | [observability/stackpack.sh](observability/stackpack.sh) `observability_get_component_snapshot` | [observability/stql.sh](observability/stql.sh) `observability_get_component_state` | [observability/stql.sh](observability/stql.sh) `observability_install_cli` | [observability/cli.sh](observability/cli.sh) -`rancher_create_apikey` | [rancher/user-actions.sh](rancher/user-actions.sh) -`rancher_create_customcluster` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) -`rancher_first_login` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) -`rancher_get_clusterid` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) -`rancher_get_clusterregistrationcommand` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) -`rancher_install_withcertmanagerclusterissuer` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) -`rancher_list_clusters` | [rancher/cluster-actions.sh](rancher/cluster-actions.sh) -`rancher_login_withpassword` | [rancher/user-actions.sh](rancher/user-actions.sh) -`rancher_update_password` | [rancher/user-actions.sh](rancher/user-actions.sh) -`rancher_update_serverurl` | [rancher/manager-settings.sh](rancher/manager-settings.sh) -`rancher_wait_capiready` | [rancher/manager-lifecycle.sh](rancher/manager-lifecycle.sh) +`rancher_create_apikey` | [rancher/user_actions.sh](rancher/user_actions.sh) +`rancher_create_customcluster` | [rancher/cluster_actions.sh](rancher/cluster_actions.sh) +`rancher_first_login` | [rancher/manager_lifecycle.sh](rancher/manager_lifecycle.sh) +`rancher_get_clusterid` | [rancher/cluster_actions.sh](rancher/cluster_actions.sh) +`rancher_get_clusterregistrationcommand` | [rancher/cluster_actions.sh](rancher/cluster_actions.sh) +`rancher_install_withcertmanagerclusterissuer` | [rancher/manager_lifecycle.sh](rancher/manager_lifecycle.sh) +`rancher_list_clusters` | [rancher/cluster_actions.sh](rancher/cluster_actions.sh) +`rancher_login_withpassword` | [rancher/user_actions.sh](rancher/user_actions.sh) +`rancher_update_password` | [rancher/user_actions.sh](rancher/user_actions.sh) +`rancher_update_serverurl` | [rancher/manager_settings.sh](rancher/manager_settings.sh) +`rancher_wait_capiready` | [rancher/manager_lifecycle.sh](rancher/manager_lifecycle.sh) ## Concrete examples diff --git a/scripts/k3s/cluster-lifecycle.sh b/scripts/k3s/cluster_lifecycle.sh similarity index 100% rename from scripts/k3s/cluster-lifecycle.sh rename to scripts/k3s/cluster_lifecycle.sh diff --git a/scripts/kubernetes/certificate-management.sh b/scripts/kubernetes/certificate_management.sh similarity index 100% rename from scripts/kubernetes/certificate-management.sh rename to scripts/kubernetes/certificate_management.sh diff --git a/scripts/kubernetes/cluster-status.sh b/scripts/kubernetes/cluster_status.sh similarity index 100% rename from scripts/kubernetes/cluster-status.sh rename to scripts/kubernetes/cluster_status.sh diff --git a/scripts/observability/api-key.sh b/scripts/observability/api_key.sh similarity index 100% rename from scripts/observability/api-key.sh rename to scripts/observability/api_key.sh diff --git a/scripts/rancher/cluster-actions.sh b/scripts/rancher/cluster_actions.sh similarity index 100% rename from scripts/rancher/cluster-actions.sh rename to scripts/rancher/cluster_actions.sh diff --git a/scripts/rancher/manager-lifecycle.sh b/scripts/rancher/manager_lifecycle.sh similarity index 100% rename from scripts/rancher/manager-lifecycle.sh rename to scripts/rancher/manager_lifecycle.sh diff --git a/scripts/rancher/manager-settings.sh b/scripts/rancher/manager_settings.sh similarity index 100% rename from scripts/rancher/manager-settings.sh rename to scripts/rancher/manager_settings.sh diff --git a/scripts/rancher/user-actions.sh b/scripts/rancher/user_actions.sh similarity index 100% rename from scripts/rancher/user-actions.sh rename to scripts/rancher/user_actions.sh