diff --git a/charts/common/.helmignore b/charts/common/.helmignore deleted file mode 100644 index 4379e2b..0000000 --- a/charts/common/.helmignore +++ /dev/null @@ -1,26 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -# OWNERS file for Kubernetes -OWNERS -# helm-docs templates -*.gotmpl diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml deleted file mode 100644 index 7b1db81..0000000 --- a/charts/common/Chart.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v2 -name: smarter-common -description: smarter-common chart for SMARTER edge devices -home: https://gitlab.com/smarter-project/documentation/charts/common -version: 0.0.1 -appVersion: v0.0.1 -kubeVersion: ">=1.16.0-0" -keywords: - - kubernetes - - device - - hardware -sources: - - https://gitlab.com/smarter-project/documentation - -annotations: - artifacthub.io/changes: | - - Fix template - - Add annotations - artifacthub.io/license: Apache-2.0 - artifacthub.io/maintainers: | - - name: Alexandre Ferreira - email: alexandref75@gmail.com - artifacthub.io/prerelease: "false" - artifacthub.io/signKey: | - fingerprint: 82AD709FEC4ECA4C84B093889BDC9DE410CFC23B - url: https://keybase.io/alexandref75/pgp_keys.asc diff --git a/charts/common/README.md b/charts/common/README.md deleted file mode 100644 index 8914e65..0000000 --- a/charts/common/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# smarter-common - -Install common objects for SMARTER (namespace) - -## TL;DR - -```console -helm install smarter-common charts/common -``` - diff --git a/charts/common/templates/common.yaml b/charts/common/templates/common.yaml deleted file mode 100644 index 3dc9bcd..0000000 --- a/charts/common/templates/common.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.application.namespace }} - labels: - name: {{ .Values.application.namespace }} diff --git a/charts/common/values.yaml b/charts/common/values.yaml deleted file mode 100644 index 2aba265..0000000 --- a/charts/common/values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# - -application: - namespace: smarter diff --git a/charts/smarter-edge/Chart.yaml b/charts/smarter-edge/Chart.yaml index 283a1d1..2db625f 100644 --- a/charts/smarter-edge/Chart.yaml +++ b/charts/smarter-edge/Chart.yaml @@ -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.1 +version: 0.0.2 # 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 @@ -29,13 +29,13 @@ kubeVersion: ">=1.18.0-0" dependencies: - name: smarter-cni - version: 0.0.1 + version: 0.0.2 repository: https://smarter-project.gitlab.io/documentation/charts - name: smarter-dns - version: 0.0.1 + version: 0.0.2 repository: https://smarter-project.gitlab.io/documentation/charts - name: smarter-device-manager - version: 0.0.2 + version: 0.0.3 repository: https://smarter-project.gitlab.io/documentation/charts icon: https://gitlab.com/uploads/-/system/group/avatar/59012546/ARM1636_Project_Logo_ST2_RGB_V1.png diff --git a/charts/smarter-edge/values.yaml b/charts/smarter-edge/values.yaml index c6baa42..18ffbdc 100644 --- a/charts/smarter-edge/values.yaml +++ b/charts/smarter-edge/values.yaml @@ -5,17 +5,14 @@ namespace: smarter smarter-dns: - configuration: - nodeSelector: - smarter.type: edge + nodeSelector: + smarter.type: edge smarter-cni: - configuration: - nodeSelector: - smarter.type: edge + nodeSelector: + smarter.type: edge smarter-device-manager: - configuration: - nodeSelector: - smarter.type: edge + nodeSelector: + smarter.type: edge diff --git a/public/README.md b/public/README.md index 5318a19..b918f1f 100644 --- a/public/README.md +++ b/public/README.md @@ -34,18 +34,11 @@ In the case you wish to deploy the demo we assume you have done the following: ## Smarter k3s server configuration -- Use the helm chart on https://gitlab.com/smarter-project/documentation/charts to create the required common objects +- Use the helm chart on https://gitlab.com/smarter-project/documentation/chart to install CNI, DNS and device-manager ```bash - helm install smarter-common charts/common - ``` -- Use the helm chart on https://gitlab.com/smarter-project/smarter-cni/chart to install the CNI - ```bash - helm install smarter-cni chart - ``` -- Use the helm chart on https://gitlab.com/smarter-project/smarter-dns/chart to install the dns server for the edge - ```bash - helm install smarter-dns chart + helm install --namespace smarter --create-namespace smarter-edge chart ``` +- Use the helm chart on each of hte modules. Remember to use the namespace and the correct labels. The individual charts do not install on devices automatically, they require labels. ## To setup your registered edge node from your development machine Plugin USB camera. You should be able to see the camera at `/dev/video0`.