From 00481ecc6f0e15c47f4f60e31265e86fac0d909b Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Mon, 7 Nov 2022 20:56:14 -0600 Subject: [PATCH 1/5] add helm action Signed-off-by: Eric Van Hensbergen --- .github/workflows/helm.yml | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/helm.yml diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml new file mode 100644 index 0000000..519e947 --- /dev/null +++ b/.github/workflows/helm.yml @@ -0,0 +1,46 @@ +# release.yaml +name: Release Charts + +on: + push: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + # Optional step if GPG signing is used + - name: Prepare GPG key + run: | + gpg_dir=.cr-gpg + mkdir "$gpg_dir" + keyring="$gpg_dir/secring.gpg" + base64 -d <<< "$GPG_KEYRING_BASE64" > "$keyring" + passphrase_file="$gpg_dir/passphrase" + echo "$GPG_PASSPHRASE" > "$passphrase_file" + echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV" + echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV" + echo "sign: true" > cr.yaml + echo "key: Smarter Project" >> cr.yaml + env: + GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}" + GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.4.1 + with: + config: cr.yaml + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + From 06f381b14435f9a9e92205b199faaeb3a188641e Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Mon, 7 Nov 2022 21:11:10 -0600 Subject: [PATCH 2/5] Fix demo charts to point to github Signed-off-by: Eric Van Hensbergen --- charts/demo/Chart.yaml | 29 ++++++++++++++--------------- charts/demo/values.yaml | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/charts/demo/Chart.yaml b/charts/demo/Chart.yaml index b75b87a..05f6b9b 100644 --- a/charts/demo/Chart.yaml +++ b/charts/demo/Chart.yaml @@ -32,24 +32,23 @@ dependencies: repository: https://fluent.github.io/helm-charts alias: fluent-bit - name: smarter-gstreamer - version: 0.0.1 - repository: https://smarter-project.github.io/documentation/charts + version: 0.0.2 + repository: https://smarter-project.github.io/gstreamer - name: smarter-pulseaudio - version: 0.0.1 - repository: https://fluent.github.io/helm-charts/documentation/charts + version: 0.0.2 + repository: https://smarter-project.github.io/pulseaudio - name: smarter-image-detector - version: 0.0.1 - repository: https://fluent.github.io/helm-charts/documentation/charts + version: 0.0.2 + repository: https://smarter-project.github.io/image-detector - name: smarter-audio-client - version: 0.0.1 - repository: https://fluent.github.io/helm-charts/documentation/charts - - name: smarter-admission-controller - version: 0.0.1 - repository: https://fluent.github.io/helm-charts/documentation/charts - + version: 0.0.2 + repository: https://smarter-project.github.io/audio-client + - name: smarter-inference + version: 0.0.2 + repository: https://smarter-project.github.io/smarter-inference +icon: https://gitlab.com/uploads/-/system/group/avatar/59012546/ARM1636_Project_Logo_ST2_RGB_V1.png sources: - https://gitlab.com/smarter-project/documentation - annotations: artifacthub.io/changes: | - Initial release @@ -59,5 +58,5 @@ annotations: email: ericvh@gmail.com artifacthub.io/prerelease: "false" artifacthub.io/signKey: | - fingerprint: 9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 - url: https://keybase.io/ericvh/pgp_keys.asc + fingerprint: 71EDA4E3D652DC73EB09E3A5387D298C169CF24E + url: https://smarter-project.github.io/documentation/pgp_keys.asc diff --git a/charts/demo/values.yaml b/charts/demo/values.yaml index 0eff625..f23ce69 100644 --- a/charts/demo/values.yaml +++ b/charts/demo/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. global: - domain: d.getsmarter.io + domain: example.com fluent-bit: fluentd: From d128c9dd786ee6d1e527f8979ad73e1e5d9b1612 Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Mon, 7 Nov 2022 21:19:23 -0600 Subject: [PATCH 3/5] Update paths to github packages Signed-off-by: Eric Van Hensbergen --- charts/demo/Chart.yaml | 6 +++--- charts/smarter-cloud/Chart.yaml | 7 +++---- charts/smarter-edge/Chart.yaml | 18 +++++++++--------- charts/test-pod/Chart.yaml | 10 +++++----- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/charts/demo/Chart.yaml b/charts/demo/Chart.yaml index 05f6b9b..f086787 100644 --- a/charts/demo/Chart.yaml +++ b/charts/demo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: smarter-demo description: smarter edge demo deployment chart - +home: https://getsmarter.io # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -48,7 +48,7 @@ dependencies: repository: https://smarter-project.github.io/smarter-inference icon: https://gitlab.com/uploads/-/system/group/avatar/59012546/ARM1636_Project_Logo_ST2_RGB_V1.png sources: - - https://gitlab.com/smarter-project/documentation + - https://github.com/smarter-project/documentation annotations: artifacthub.io/changes: | - Initial release diff --git a/charts/smarter-cloud/Chart.yaml b/charts/smarter-cloud/Chart.yaml index 1846488..0550bee 100644 --- a/charts/smarter-cloud/Chart.yaml +++ b/charts/smarter-cloud/Chart.yaml @@ -17,14 +17,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. appVersion: "2.0.0" -logo: https://gitlab.com/uploads/-/system/group/avatar/6339043/ARM1636_Project_Logo_ST2_RGB_V1.png kubeVersion: ">=1.18.0-0" dependencies: @@ -59,5 +58,5 @@ annotations: email: ericvh@gmail.com artifacthub.io/prerelease: "false" artifacthub.io/signKey: | - fingerprint: 9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 - url: https://keybase.io/ericvh/pgp_keys.asc \ No newline at end of file + fingerprint: 71EDA4E3D652DC73EB09E3A5387D298C169CF24E + url: https://smarter-project.github.io/documentation/pgp_keys.asc \ No newline at end of file diff --git a/charts/smarter-edge/Chart.yaml b/charts/smarter-edge/Chart.yaml index 2db625f..c7c66e1 100644 --- a/charts/smarter-edge/Chart.yaml +++ b/charts/smarter-edge/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: smarter-edge description: smarter edge deploymnent chart -home: https://gitlab.com/smarter-project/documentation +home: https://getsmarter.io # A chart can be either an 'application' or a 'library' chart. # @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.2 +version: 0.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -30,17 +30,17 @@ kubeVersion: ">=1.18.0-0" dependencies: - name: smarter-cni version: 0.0.2 - repository: https://smarter-project.gitlab.io/documentation/charts + repository: https://smarter-project.github.io/smarter-cni - name: smarter-dns version: 0.0.2 - repository: https://smarter-project.gitlab.io/documentation/charts + repository: https://smarter-project.github.io/smarter-dns - name: smarter-device-manager - version: 0.0.3 - repository: https://smarter-project.gitlab.io/documentation/charts + version: 0.0.7 + repository: https://smarter-project.github.io/smarter-device-manager icon: https://gitlab.com/uploads/-/system/group/avatar/59012546/ARM1636_Project_Logo_ST2_RGB_V1.png sources: - - https://gitlab.com/smarter-project/documentation + - https://github.com/smarter-project/documentation annotations: artifacthub.io/changes: | @@ -51,5 +51,5 @@ annotations: email: ericvh@gmail.com artifacthub.io/prerelease: "false" artifacthub.io/signKey: | - fingerprint: 9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 - url: https://keybase.io/ericvh/pgp_keys.asc + fingerprint: 71EDA4E3D652DC73EB09E3A5387D298C169CF24E + url: https://smarter-project.github.io/documentation/pgp_keys.asc diff --git a/charts/test-pod/Chart.yaml b/charts/test-pod/Chart.yaml index d432c51..cbf765e 100644 --- a/charts/test-pod/Chart.yaml +++ b/charts/test-pod/Chart.yaml @@ -1,14 +1,14 @@ apiVersion: v2 name: smarter-test-pod description: smarter-test-pod chart for SMARTER edge devices -home: https://gitlab.com/smarter-project/documentation/charts/test-pod -version: 0.0.1 +home: https://getsmater.io +version: 0.0.2 appVersion: latest kubeVersion: ">=1.16.0-0" keywords: - kubernetes sources: - - https://gitlab.com/smarter-project/documentation/charts/test-pod + - https://github.com/smarter-project/documentation/charts/test-pod annotations: artifacthub.io/changes: | @@ -20,5 +20,5 @@ annotations: email: alexandref75@gmail.com artifacthub.io/prerelease: "false" artifacthub.io/signKey: | - fingerprint: 82AD709FEC4ECA4C84B093889BDC9DE410CFC23B - url: https://keybase.io/alexandref75/pgp_keys.asc + fingerprint: 71EDA4E3D652DC73EB09E3A5387D298C169CF24E + url: https://smarter-project.github.io/documentation/pgp_keys.asc From b8d06774fa96f22b4691ace3d9021df73dc61b90 Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Mon, 7 Nov 2022 21:30:10 -0600 Subject: [PATCH 4/5] Fix up README and remove namespace values Removing namespace values so they can be set consistently from the helm command line. Signed-off-by: Eric Van Hensbergen --- charts/demo/README.md | 3 +-- charts/smarter-cloud/Chart.yaml | 2 +- charts/smarter-cloud/README.md | 3 +-- charts/smarter-cloud/values.yaml | 2 -- charts/smarter-edge/Chart.yaml | 2 +- charts/smarter-edge/README.md | 5 ++--- charts/smarter-edge/values.yaml | 2 -- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/charts/demo/README.md b/charts/demo/README.md index 52a68ca..a0b7b72 100644 --- a/charts/demo/README.md +++ b/charts/demo/README.md @@ -7,8 +7,7 @@ For more information on smarter go to https://getsmarter.io ## TL;DR ```console -helm repo add smarter https://smarter-project.gitlab.io/documentation/charts -helm install --set domain=example.com demo smarter/demo +helm install --set domain=example.com demo charts/demo ``` # Overview diff --git a/charts/smarter-cloud/Chart.yaml b/charts/smarter-cloud/Chart.yaml index 0550bee..c9387c0 100644 --- a/charts/smarter-cloud/Chart.yaml +++ b/charts/smarter-cloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: smarter-cloud -description: smarter cloud deploymnent chart +description: smarter cloud deployment chart home: https://gitlab.com/smarter-project/documentation diff --git a/charts/smarter-cloud/README.md b/charts/smarter-cloud/README.md index 27bbad5..259cca6 100644 --- a/charts/smarter-cloud/README.md +++ b/charts/smarter-cloud/README.md @@ -13,8 +13,7 @@ For more information on smarter go to https://getsmarter.io ## TL;DR ```console -helm repo add smarter https://smarter-project.gitlab.io/documentation/charts -helm install --set domain=example.com --set email=youremail@mail.com my-smarter-cloud smarter-cloud +helm install --set domain=example.com --set email=youremail@mail.com smarter-cloud charts/smarter-cloud ``` # Overview diff --git a/charts/smarter-cloud/values.yaml b/charts/smarter-cloud/values.yaml index 9f34de9..ef4a01d 100644 --- a/charts/smarter-cloud/values.yaml +++ b/charts/smarter-cloud/values.yaml @@ -2,8 +2,6 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -namespace: smarter-cloud - domain: example.com cert-manager: diff --git a/charts/smarter-edge/Chart.yaml b/charts/smarter-edge/Chart.yaml index c7c66e1..2ab7a4e 100644 --- a/charts/smarter-edge/Chart.yaml +++ b/charts/smarter-edge/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: smarter-edge -description: smarter edge deploymnent chart +description: smarter edge deployment chart home: https://getsmarter.io diff --git a/charts/smarter-edge/README.md b/charts/smarter-edge/README.md index d0e086f..fc2fcdc 100644 --- a/charts/smarter-edge/README.md +++ b/charts/smarter-edge/README.md @@ -9,8 +9,7 @@ For more information on smarter go to https://getsmarter.io ## TL;DR ```console -helm repo add smarter https://smarter-project.gitlab.io/documentation/charts -helm install my-smarter-edge smarter-edge +helm install smarter-edge charts/smarter-edge ``` # Overview @@ -26,7 +25,7 @@ This chart assumes a full deployment of k3s with traefik, etc. # Uninstalling the Chart ``` -$ helm delete my-smarter-edge +$ helm delete smarter-edge ``` # Parameters diff --git a/charts/smarter-edge/values.yaml b/charts/smarter-edge/values.yaml index 18ffbdc..17b806f 100644 --- a/charts/smarter-edge/values.yaml +++ b/charts/smarter-edge/values.yaml @@ -2,8 +2,6 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -namespace: smarter - smarter-dns: nodeSelector: smarter.type: edge From 54886a639424726a9afeeb1650cb1e396eac4044 Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Mon, 7 Nov 2022 21:54:09 -0600 Subject: [PATCH 5/5] Add minimal post-deployment notes to our charts These should be beefed out a bit eventually. Signed-off-by: Eric Van Hensbergen --- charts/demo/templates/NOTES.txt | 11 +++++++++++ charts/smarter-cloud/templates/NOTES.txt | 6 ++++++ charts/smarter-edge/templates/NOTES.txt | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 charts/demo/templates/NOTES.txt create mode 100644 charts/smarter-cloud/templates/NOTES.txt create mode 100644 charts/smarter-edge/templates/NOTES.txt diff --git a/charts/demo/templates/NOTES.txt b/charts/demo/templates/NOTES.txt new file mode 100644 index 0000000..c14a716 --- /dev/null +++ b/charts/demo/templates/NOTES.txt @@ -0,0 +1,11 @@ +Your SMARTER edge demo applications have been provisioned. +If you edge-nodes are labeled correctly with the node +4selectors as defined in values.yaml then the smarter edge demo daemonsets +will be automatically deployed to your edge nodes and forward data to your +cloud instance to be visualized in grafana. + +If you haven't already done so, provision your cloud side infrastructure to +be able to receive data from your edgem nodes. + +For more details and instructions go to https://getsmarter.io + diff --git a/charts/smarter-cloud/templates/NOTES.txt b/charts/smarter-cloud/templates/NOTES.txt new file mode 100644 index 0000000..5eb9e49 --- /dev/null +++ b/charts/smarter-cloud/templates/NOTES.txt @@ -0,0 +1,6 @@ +Your SMARTER cloud instance has been deployed. Next deploy an edge server and edge nodes to connect to it. +For more details and instructions go to https://getsmarter.io + +If you deployed your instance correctly, you should be able to log into grafana at +https://grafana.{{ .Values.domain }} with the username admin and the password {{ .Values.prometheus.grafana.adminPassword }} + diff --git a/charts/smarter-edge/templates/NOTES.txt b/charts/smarter-edge/templates/NOTES.txt new file mode 100644 index 0000000..9d18ea9 --- /dev/null +++ b/charts/smarter-edge/templates/NOTES.txt @@ -0,0 +1,7 @@ +Your SMARTER edge infrastructure has been provisioned. If you edge-nodes are labeled correctly with the node +selectors as defined in values.yaml (default smarter.type: edge) then the smarter edge infrastructure daemonsets +will be automatically deployed to your edge nodes. + +If you haven't already done so, provision your cloud side infrastructure to be able to receive data from your edgem nodes. +For more details and instructions go to https://getsmarter.io +