From 317a45fad7f93cbf8f19be138cd6be9b6be71b82 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 3 Sep 2024 07:38:40 -0700 Subject: [PATCH 1/3] default enable vector --- helm-chart/eoapi/Chart.yaml | 4 ++-- helm-chart/eoapi/values.yaml | 2 +- scripts/release.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml index c32a79a..c6766ae 100644 --- a/helm-chart/eoapi/Chart.yaml +++ b/helm-chart/eoapi/Chart.yaml @@ -15,13 +15,13 @@ kubeVersion: ">=1.23.0-0" # 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.4.7" +version: "0.4.8" # 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.3.13" +appVersion: "0.3.14" dependencies: - name: postgrescluster diff --git a/helm-chart/eoapi/values.yaml b/helm-chart/eoapi/values.yaml index 0952c10..e6ddc94 100644 --- a/helm-chart/eoapi/values.yaml +++ b/helm-chart/eoapi/values.yaml @@ -282,7 +282,7 @@ stac: WEB_CONCURRENCY: "5" vector: - enabled: false + enabled: true autoscaling: # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart # see ../../../docs/autoscaling.md for more information diff --git a/scripts/release.sh b/scripts/release.sh index a867fb2..87eade0 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -14,7 +14,7 @@ helm upgrade --install \ helm upgrade --install \ -n $RELEASE_NS --create-namespace $RELEASE_NAME \ - eoapi/eoapi --version 0.4.7 \ + eoapi/eoapi --version 0.4.8 \ -f /Users/ranchodeluxe/apps/eoapi-k8s/helm-chart/eoapi/values.yaml From d2d574576ebdfa48be6c9e7e78e6f34e39ece341 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 3 Sep 2024 09:32:30 -0700 Subject: [PATCH 2/3] stuff --- docs/autoscaling.md | 5 +++-- helm-chart/eoapi/values.yaml | 4 ++-- scripts/release.sh | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/autoscaling.md b/docs/autoscaling.md index d17b216..5b39eea 100644 --- a/docs/autoscaling.md +++ b/docs/autoscaling.md @@ -71,12 +71,13 @@ manual step that cannot be automated export RELEASE_NS=eoapi export SUPPORT_RELEASE_NAME=eoapi-support export SUPPORT_RELEASE_NS=eoapi-support + PROMETHEUS_URL="http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local" helm upgrade --install \ -n $SUPPORT_RELEASE_NS --create-namespace $SUPPORT_RELEASE_NAME \ eoapi/eoapi-support --version 0.1.4 \ - --set prometheus-adapter.prometheus.url='http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local' \ - --set grafana.datasources.datasources\\.yaml.datasources[0].url='http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local' \ + --set prometheus-adapter.prometheus.url=$PROMETHEUS_URL \ + --set grafana.datasources.datasources\\.yaml.datasources[0].url=$PROMETHEUS_URL \ -f /tmp/values-overrides.yaml helm upgrade --install \ diff --git a/helm-chart/eoapi/values.yaml b/helm-chart/eoapi/values.yaml index e6ddc94..93a6578 100644 --- a/helm-chart/eoapi/values.yaml +++ b/helm-chart/eoapi/values.yaml @@ -286,11 +286,11 @@ vector: autoscaling: # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart # see ../../../docs/autoscaling.md for more information - enabled: false + enabled: true minReplicas: 1 maxReplicas: 10 # `type`: "cpu" || "requestRate" || "both" - type: "both" + type: "requestRate" behaviour: scaleDown: stabilizationWindowSeconds: 60 diff --git a/scripts/release.sh b/scripts/release.sh index 87eade0..f846681 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -4,12 +4,13 @@ export RELEASE_NAME=eoapi export RELEASE_NS=eoapi export SUPPORT_RELEASE_NAME=eoapi-support export SUPPORT_RELEASE_NS=eoapi +PROMETHEUS_SERVER="http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local" helm upgrade --install \ -n $SUPPORT_RELEASE_NS --create-namespace $SUPPORT_RELEASE_NAME \ eoapi/eoapi-support --version 0.1.5 \ - --set prometheus-adapter.prometheus.url='http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local' \ - --set grafana.datasources.datasources\\.yaml.datasources[0].url='http://${SUPPORT_RELEASE_NAME}-prometheus-server.${SUPPORT_RELEASE_NS}.svc.cluster.local' \ + --set prometheus-adapter.prometheus.url=$PROMETHEUS_SERVER \ + --set grafana.datasources.datasources\\.yaml.datasources[0].url=$PROMETHEUS_SERVER \ -f /Users/ranchodeluxe/apps/eoapi-k8s/helm-chart/eoapi-support/values.yaml helm upgrade --install \ From 2c4e2944157d94ddd0f68e443322a403f7b6774a Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Fri, 20 Sep 2024 13:30:35 -0700 Subject: [PATCH 3/3] release eoapi with postgres 5.5.3 --- helm-chart/eoapi/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml index c97ec54..c76cb12 100644 --- a/helm-chart/eoapi/Chart.yaml +++ b/helm-chart/eoapi/Chart.yaml @@ -15,16 +15,16 @@ kubeVersion: ">=1.23.0-0" # 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.4.13" +version: "0.4.16" # 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.3.19" +appVersion: "0.3.20" dependencies: - name: postgrescluster - version: 5.5.2 + version: 5.5.3 repository: "https://devseed.com/eoapi-k8s/" condition: postgrescluster.enabled