refactor

.github/workflows/helm-tests.yml

@@ -124,8 +124,7 @@ jobs:
           echo "The previous step failed or timed out. Running cleanup logic..."
           helm uninstall $RELEASE_NAME
 
-          # need to ticket in crunchy b/c depedencies are not uninstalling via above uninstall
-          kubectl delete cm,secrets,statefulset,replicaset,deploy,pods,services,endpoints,sa,deployments --all --namespace=$RELEASE_NAME
+          kubectl delete ns/RELEASE_NAME
 
           # force GH action to show failed result
           exit 128
@@ -159,18 +158,17 @@ jobs:
           head -n 5 .github/workflows/tests/test_stac.py
           pytest .github/workflows/tests/test_stac.py
 
-          sed -i "s|raster_endpoint\=.*$|raster_endpoint\='$PUBLICIP/raster$RELEASE_NAME'|g" .github/workflows/tests/test_raster.py
-          head -n 5 .github/workflows/tests/test_raster.py
-          pytest .github/workflows/tests/test_raster.py
+          #sed -i "s|raster_endpoint\=.*$|raster_endpoint\='$PUBLICIP/raster$RELEASE_NAME'|g" .github/workflows/tests/test_raster.py
+          #head -n 5 .github/workflows/tests/test_raster.py
+          #pytest .github/workflows/tests/test_raster.py
 
       - name: cleanup if tests faile
         if: steps.testrunner.outcome == 'failure'
         run: |
           echo "The previous step failed or timed out. Running cleanup logic..."
           helm uninstall $RELEASE_NAME
 
-          # need to ticket in crunchy b/c depedencies are not uninstalling via above uninstall
-          kubectl delete cm,secrets,statefulset,replicaset,deploy,pods,services,endpoints,sa,deployments --all --namespace=$RELEASE_NAME
+          kubectl delete ns/RELEASE_NAME
 
           # force GH action to show failed result
           exit 128
@@ -179,5 +177,4 @@ jobs:
         run: |
           helm uninstall $RELEASE_NAME
 
-          # need to ticket in crunchy b/c depedencies are not uninstalling via above uninstall
-          kubectl delete cm,secrets,statefulset,replicaset,deploy,pods,services,endpoints,sa,deployments --all --namespace=$RELEASE_NAME
+          kubectl delete ns/RELEASE_NAME

README.md

@@ -37,37 +37,50 @@ If you don't have a k8s cluster set up on AWS or GCP then follow an IaC guide be
 
 <a name="helminstall"/>
 
-## Helm Installation 
+## Helm Installation
 
-Once you have a k8s cluster set up you can `helm install` eoAPI as follows:
+Once you have a k8s cluster set up you can `helm install` eoAPI with the following steps:
 
-1. `helm install` from https://devseed.com/eoapi-k8s/:
+0. `eoapi-k8s` depends on the [Crunchydata Postgresql Operator](https://access.crunchydata.com/documentation/postgres-operator/latest/installation/helm). Install that first:
+
+   ```python
+   $ helm install --set disable_check_for_upgrades=true pgo oci://registry.developers.crunchydata.com/crunchydata/pgo
+   ```
+
+
+1. Add the eoapi repo from https://devseed.com/eoapi-k8s/:
 
     ```python
-      # add the eoapi helm repo locally
       $ helm repo add eoapi https://devseed.com/eoapi-k8s/
-
-      # list out the eoapi chart versions
-      $ helm search repo eoapi --versions
-      NAME            CHART VERSION   APP VERSION     DESCRIPTION                                       
-      eoapi/eoapi     0.1.1           0.1.0           Create a full Earth Observation API with Metada...
-      eoapi/eoapi     0.1.2           0.1.0           Create a full Earth Observation API with Metada...
-
-      # optionally override keys/values in the default `values.yaml` with a custom `config.yaml` like below:
-      $ cat config.yaml 
-      vector:
-        enable: false
-      pgstacBootstrap:
-        settings:
-          envVars:
-            LOAD_FIXTURES: "0"
-            RUN_FOREVER: "1"
-
-      # then run `helm install` with those overrides 
-      $ helm install -n eoapi --create-namespace eoapi eoapi/eoapi --version 0.1.2 -f config.yaml
     ```
 
-2. or `helm install` from this repo's `helm-chart/` folder:
+2. List out the eoapi chart versions
+
+   ```python
+   $ helm search repo eoapi --versions
+   NAME            CHART VERSION   APP VERSION     DESCRIPTION                                       
+   eoapi/eoapi     0.2.14          0.3.1           Create a full Earth Observation API with Metada...
+   eoapi/eoapi     0.1.13          0.2.11          Create a full Earth Observation API with Metada...
+   ```
+3. Optionally override keys/values in the default `values.yaml` with a custom `config.yaml` like below:
+
+   ```python
+   $ cat config.yaml 
+   vector:
+     enable: false
+   pgstacBootstrap:
+     settings:
+       envVars:
+         LOAD_FIXTURES: "0"
+         RUN_FOREVER: "1"
+   ```
+4. Then `helm install` with those `config.yaml` values:
+
+   ```python
+   $ helm install -n eoapi --create-namespace eoapi eoapi/eoapi --version 0.1.2 -f config.yaml
+   ```
+
+5. or check out this repo and `helm install` from this repo's `helm-chart/` folder:
 
     ```python
       ######################################################

helm-chart/eoapi/Chart.yaml

@@ -26,9 +26,6 @@ version: "0.3.0"
 appVersion: "0.3.2"
 
 dependencies:
-  - name: pgo
-    version: 5.5.2
-    respository: "file://charts/pgo"
   - name: postgrescluster
     version: 5.5.2
     respository: "file://charts/postgrescluster"