Infra255 fixing minor issues with local setup (#19)

* Set varialbe to empty by deafault and do not use azures db_fqdm * missing DB password that possibly should only have been removed for Azure * blobs are just an azure thing I hope * default value for storage_class_name * Update roles/ckan/templates/kubernetes/ckan.yaml Co-authored-by: Jonathan Berry <[email protected]> --------- Co-authored-by: Jonathan Berry <[email protected]>
fjelltopp · Jul 30, 2024 · 13e225c · 13e225c
1 parent 9a977bc
commit 13e225c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml
@@ -29,6 +29,7 @@ jenkins_aws_account_id: "791438942407"
 # Environment type - local is for Minikube, aws for AWS :)
 # by default it's local
 fjelltopp_env_type: "local"
+fjelltopp_cloud_provider: ''
 
 # Helm role
 # https://github.com/helm/helm/releases/
@@ -69,7 +70,6 @@ datapusher_image: clementmouchet/datapusher # this version is incredibly old, bu
 ckan_max_upload_size_mb: "256"
 ckan_redis_url: "redis://redis:6379/1"
 
-
 ckan_solr_url: "http://solr:8983/solr/ckan"
 # ckan_sqlalchemy_url: "postgresql://ckan:12345678@db/ckan"
 ckan_plugins: "stats text_view image_view recline_view blob_storage authz_service"
@@ -138,3 +138,5 @@ who_authenticators: |-
   plugins =
       auth_tkt
       ckan.lib.authenticator:UsernamePasswordAuthenticator
+
+storage_class_name: "efs-client"
diff --git a/roles/ckan/tasks/main.yml b/roles/ckan/tasks/main.yml
@@ -17,4 +17,4 @@
   when: fjelltopp_cloud_provider == 'azure'
 
 - include_tasks: ./deploy.yml
-  when: fjelltopp_cloud_provider != 'azure'
+  when: fjelltopp_cloud_provider != 'azure'
diff --git a/roles/ckan/templates/kubernetes/ckan.yaml b/roles/ckan/templates/kubernetes/ckan.yaml
@@ -149,8 +149,6 @@ spec:
               value: "{{ ckan_postgres_password }}"
             - name: PIPENV_DONT_LOAD_ENV
               value: "1"
-            - name: POSTGRES_HOST
-              value: "{{ db_fqdn }}"
 {% if fjelltopp_cloud_provider != 'azure' %}
             - name: AWS_DEFAULT_REGION
               value: "{{ aws_region }}"
@@ -216,6 +214,7 @@ spec:
 {% endif %}
       restartPolicy: Always
       volumes:
+{% if fjelltopp_cloud_provider == 'azure' %}
         - name: ckan-storage
           persistentVolumeClaim:
             claimName: ckan-storage-blob
@@ -225,6 +224,17 @@ spec:
         - name: ckan-resources
           persistentVolumeClaim:
             claimName: ckan-resources-blob
+{% else %}
+        - name: ckan-storage
+          persistentVolumeClaim:
+            claimName: ckan-storage
+        - name: ckan-webassets
+          persistentVolumeClaim:
+            claimName: ckan-webassets
+        - name: ckan-resources
+          persistentVolumeClaim:
+            claimName: ckan-resources
+{% endif %}
 
 {% if fjelltopp_env_type == 'local' %}
         - name: localckan

diff --git a/roles/ckan/templates/kubernetes/ckandb_job.yaml b/roles/ckan/templates/kubernetes/ckandb_job.yaml
@@ -24,7 +24,9 @@ spec:
               value: "{{ ckan_db_hostname }}"
             - name: POSTGRES_USER
               value: "{{ rds_admin_username }}"
-
+            - name: POSTGRES_PASSWORD
+              value: "{{ ckan_postgres_password }}"
+
           name: ckan-db-init
           image: postgres:13
           command: ['bash', '-c']