From 72b8b684349ff611b86a2d4d958547cbdda989a8 Mon Sep 17 00:00:00 2001 From: Felix Delattre Date: Mon, 28 Oct 2024 16:35:51 +0100 Subject: [PATCH] Added general polder deployment with its dependencies. --- .github/workflows/check_charts.yaml | 4 ++-- deployment/helm/.gitignore | 37 +++++++++++++++++++++++++++++ deployment/helm/polder/.helmignore | 23 ++++++++++++++++++ deployment/helm/polder/Chart.lock | 9 +++++++ deployment/helm/polder/Chart.yaml | 24 +++++++++++++++++++ deployment/helm/polder/values.yaml | 15 ++++++++++++ pyproject.toml | 3 +-- 7 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 deployment/helm/.gitignore create mode 100644 deployment/helm/polder/.helmignore create mode 100644 deployment/helm/polder/Chart.lock create mode 100644 deployment/helm/polder/Chart.yaml create mode 100644 deployment/helm/polder/values.yaml diff --git a/.github/workflows/check_charts.yaml b/.github/workflows/check_charts.yaml index 3e22595..bf222f0 100644 --- a/.github/workflows/check_charts.yaml +++ b/.github/workflows/check_charts.yaml @@ -25,7 +25,7 @@ jobs: - name: Check Version run: | current_version=$(grep '^version=' pyproject.toml | cut -f2 -d= | tr -d ' ' | tr -d '"') - app_version=$(grep 'appVersion:' deployment/helm/Chart.yaml | cut -f2 -d: | tr -d ' ' | tr -d '"') + app_version=$(grep 'appVersion:' deployment/helm/polder/Chart.yaml | cut -f2 -d: | tr -d ' ' | tr -d '"') if [[ "$current_version" != "$app_version" ]]; then echo "❌ current version from pyproject.toml ($current_version) and appVersion from Chart.yaml ($app_version) differs"; exit 1; @@ -74,4 +74,4 @@ jobs: - name: Run chart-testing (install) run: ct install --chart-dirs deployment/k8s - if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file + if: steps.list-changed.outputs.changed == 'true' diff --git a/deployment/helm/.gitignore b/deployment/helm/.gitignore new file mode 100644 index 0000000..92a43e0 --- /dev/null +++ b/deployment/helm/.gitignore @@ -0,0 +1,37 @@ +# General files for the project +pkg/* +*.pyc +bin/* +.project +/.bin +/_test/secrets/*.json + +# OSX leaves these everywhere on SMB shares +._* + +# OSX trash +.DS_Store + +# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA +.idea/ +*.iml + +# Vscode files +.vscode + +# Emacs save files +*~ +\#*\# +.\#* + +# Vim-related files +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +*.un~ +Session.vim +.netrwhist + +# Chart dependencies +**/charts/*.tgz + +.history diff --git a/deployment/helm/polder/.helmignore b/deployment/helm/polder/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/deployment/helm/polder/.helmignore @@ -0,0 +1,23 @@ +# 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 +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deployment/helm/polder/Chart.lock b/deployment/helm/polder/Chart.lock new file mode 100644 index 0000000..9790b1a --- /dev/null +++ b/deployment/helm/polder/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: eoapi + repository: https://devseed.com/eoapi-k8s/ + version: 0.4.17 +- name: webapp-polder + repository: file://../webapp-polder + version: 0.1.0 +digest: sha256:42a9ad509dc7c456f1d479cff6085182c439b28d02a50497dc5de373b8d89247 +generated: "2024-10-28T17:29:59.493228222+01:00" diff --git a/deployment/helm/polder/Chart.yaml b/deployment/helm/polder/Chart.yaml new file mode 100644 index 0000000..a92ee56 --- /dev/null +++ b/deployment/helm/polder/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: polder +description: Create a polder - Web AOI viewer - instance. + +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 + +# 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: "0.2.0" + +dependencies: + - name: eoapi + version: 0.4.17 + repository: "https://devseed.com/eoapi-k8s/" + - name: webapp-polder + version: 0.1.0 + repository: file://../webapp-polder diff --git a/deployment/helm/polder/values.yaml b/deployment/helm/polder/values.yaml new file mode 100644 index 0000000..a9cde19 --- /dev/null +++ b/deployment/helm/polder/values.yaml @@ -0,0 +1,15 @@ +# Default values for polder. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ +replicaCount: 1 + +# This is to override the chart name. +nameOverride: "polder" +fullnameOverride: "test-polder" + +# polder custom configuration +mapboxToken: "pk.eyJ0IjoiZGV2c2VlZCIsImEiOiJnUi1mbkVvIn0.018aLhX0Mb0tdtaT2QNe2Q" +stacApi: "https://rx2hna9pbg.execute-api.eu-central-1.amazonaws.com" +tilerApi: "https://zbrrek2x0i.execute-api.eu-central-1.amazonaws.com" diff --git a/pyproject.toml b/pyproject.toml index 688f929..7c0a2a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: GIS", ] -version="0.0.1" +version="0.2.0" dependencies = [ ] @@ -41,4 +41,3 @@ Documentation = "https://developmentseed.org/polder/" Issues = "https://github.com/developmentseed/polder/issues" Source = "https://github.com/developmentseed/polder" Changelog = "https://developmentseed.org/polder/release-notes/" -