Merge pull request #234 from tapis-project/staging

Staging

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Notable changes between versions.
 
+## 1.3.9 
+
+- [Pods: 1.3.0 to 1.3.1 (tapis/pods-api)](https://github.com/tapis-project/pods_service/blob/prod/CHANGELOG.md#131---2023-06-06)
+- [Abaco: 1.3.0 to 1.3.1 (abaco/core-v3)](https://github.com/TACC/abaco/blob/prod-v3/CHANGELOG.md#131---2023-06-06)
+- Refactored deployment scripts for files and added a script to create the files db if it doesn't exist
+
 ## 1.3.8
 
 - Added java heap max and min options for apps, systems, and notifications when using Docker compose.
@@ -14,7 +20,7 @@ Notable changes between versions.
   - Added a DB init script for files
   - Removed hard-coded urls in proxy
   - General cleanup & bugfixes
-  
+
 ### Breaking Changes
 
 - There is a breaking change related to how Files and Systems interact for systems of type IRODS. Please see the [CHANGELOG](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md) for the Files service for more information.

playbooks/roles/actors/defaults/main/vars.yml

@@ -6,7 +6,7 @@ actors_service_url: '{{ global_service_url }}'
 actors_service_tenant_id: admin
 actors_service_site_id: '{{ global_site_id }}'
 actors_service_name: actors
-actors_service_version: 1.3.0
+actors_service_version: 1.3.1
 actors_storage_class: '{{ global_storage_class }}'
 actors_rabbit_pvc: actors-rabbitmq-vol01
 actors_mongo_pvc: actors-mongo-vol01

playbooks/roles/actors/templates/kube/api/burndown

@@ -3,16 +3,13 @@
 # configs
 kubectl delete -f ../actors-config.yml
 kubectl delete -f nginx-config.yml
-kubectl delete -f prometheus-config.yml
 kubectl delete -f configmap.yml
 
 # apps
 kubectl delete -f reg.yml
 kubectl delete -f mes.yml
 kubectl delete -f admin.yml
 kubectl delete -f events.yml
-kubectl delete -f prometheus.yml
-kubectl delete -f grafana.yml
 kubectl delete -f metrics.yml
 kubectl delete -f nginx.yml
 

playbooks/roles/actors/templates/kube/api/burnup

@@ -6,7 +6,6 @@ kubectl apply -f security.yml
 # configs
 kubectl apply -f ../actors-config.yml
 kubectl apply -f nginx-config.yml
-kubectl apply -f prometheus-config.yml
 kubectl apply -f configmap.yml
 
 # pvcs
@@ -32,6 +31,4 @@ kubectl apply -f reg.yml
 kubectl apply -f mes.yml
 kubectl apply -f admin.yml
 kubectl apply -f events.yml
-kubectl apply -f prometheus.yml
-kubectl apply -f grafana.yml
 kubectl apply -f metrics.yml

playbooks/roles/actors/templates/kube/api/metrics.yml

@@ -16,6 +16,7 @@ spec:
       - name: actors-metrics
         image: {{ actors_core_image }}
         imagePullPolicy: {{actors_image_pull_policy}}
+        command: ["/home/tapis/actors/metrics_cron_check.sh"]
         ports:
         - name: flask
           containerPort: 5000

playbooks/roles/actors/templates/kube/api/service.yml

@@ -92,19 +92,6 @@ spec:
     port: 5000
     targetPort: 5000
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: actors-metrics
-spec:
-  selector:
-    app: actors-metrics
-  ports:
-  - name: flask
-    port: 5000
-    targetPort: 5000
-
 ---
 apiVersion: v1
 kind: Service
@@ -117,30 +104,3 @@ spec:
   - name: flask
     port: 5000
     targetPort: 5000
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: actors-grafana
-spec:
-  selector:
-    app: actors-grafana
-  ports:
-  - name: grafana
-    port: 3000
-    targetPort: 3000
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: actors-prometheus
-spec:
-  selector:
-    app: actors-prometheus
-  ports:
-  - name: prometheus
-    port: 9090
-    targetPort: 9090
-

playbooks/roles/baseburnup/defaults/main/vars.yml

@@ -1,4 +1,4 @@
-baseburnup_tapis_deployer_version: 1.3.8
+baseburnup_tapis_deployer_version: 1.3.9
 baseburnup_service_url: "{{ global_service_url }}"
 baseburnup_vault_url: "{{ global_vault_url }}"
 

playbooks/roles/files/templates/docker/docker-compose.yml

@@ -91,6 +91,16 @@ services:
       - TAPIS_SITE_ID={{ files_service_site_id }}
       - TOKENS_SERVICE_URL={{ files_service_url }}
       - TENANTS_SERVICE_URL={{ files_service_url}}
+      - DB_HOST=files-postgres
+      - DB_NAME=tapisfiles
+      - DB_USERNAME=tapisfiles
+      - POSTGRES_DB=tapisfiles
+      - POSTGRES_USER=tapisfiles
+      - RABBITMQ_DEFAULT_USER=tapisfiles
+      - RABBITMQ_DEFAULT_VHOST=tapisfiles
+      - RABBITMQ_HOSTNAME=files-rabbitmq
+      - RABBITMQ_USERNAME=tapisfiles
+      - RABBITMQ_VHOST=tapisfiles
     command: ["java", "-Xmx3g", "-cp", "target/tapis-files.jar:target/dependencies/*", "edu.utexas.tacc.tapis.files.lib.transfers.TransfersApp"]
     depends_on:
       files-api: 

playbooks/roles/files/templates/kube/api/burndown

@@ -1,11 +1,3 @@
 #!/bin/bash
 
-kubectl delete -f ../api.yml
-kubectl delete -f ../configmap.yml
-kubectl delete -f ../workers.yml
-
-if [ "$1" = "allofit" ]
-then
-kubectl delete -f ../postgres.yml
-kubectl delete -f ../rabbitmq.yml
-fi
+kubectl delete -f deploy.yml

playbooks/roles/files/templates/kube/api/burnup

@@ -1,13 +1,4 @@
 #!/bin/bash
 
-kubectl apply -f ../files-config.yml
-kubectl apply -f ../service.yml
-kubectl apply -f ../configmap.yml
-kubectl apply -f ../pvc.yml
-kubectl apply -f ../rabbitmq-pvc.yml
-kubectl apply -f ../postgres.yml
-kubectl wait --for=condition=available deploy/files-postgres
-kubectl apply -f ../rabbitmq.yml
-kubectl wait --for=condition=available deploy/files-rabbitmq
-kubectl apply -f ../api.yml
-kubectl apply -f ../workers.yml
+kubectl apply -f service.yml
+kubectl apply -f deploy.yml

playbooks/roles/files/templates/kube/api.yml → playbooks/roles/files/templates/kube/api/deploy.yml

@@ -74,5 +74,13 @@ spec:
             secretKeyRef:
               name: tapis-files-secrets
               key: service-password
+{% if systems_globus_client_id is defined %}
+        - name: TAPIS_GLOBUS_CLIENT_ID
+          valueFrom:
+            configMapKeyRef:
+              name: files-config
+              key: globus_client_id
+{% endif %}
+
       hostname: files-api
       restartPolicy: Always

playbooks/roles/files/templates/kube/debug.service.yaml → playbooks/roles/files/templates/kube/api/service.yml

@@ -8,8 +8,7 @@ metadata:
 spec:
   type: NodePort
   ports:
-    - port: 8000
-      targetPort: 8000
-      nodePort: 32766
+    - port: 8080
+      targetPort: 8080
   selector:
     app: files-api

playbooks/roles/files/templates/kube/burndown

@@ -2,10 +2,25 @@
 
 echo "files:"
 
-kubectl delete -f api.yml 
-kubectl delete -f configmap.yml
-kubectl delete -f workers.yml
-kubectl delete -f rabbitmq.yml 
-kubectl delete -f postgres.yml 
-kubectl delete -f files-config.yml
+pushd ./worker
+./burndown
+popd
+
+pushd ./api
+./burndown
+popd
+
+pushd ./rabbitmq
+./burndown
+popd
 
+pushd ./pgadmin
+./burndown
+popd
+
+pushd ./postgres
+./burndown
+popd
+
+kubectl delete -f files-config.yml
+kubectl delete -f configmap.yml

playbooks/roles/files/templates/kube/burnup

@@ -7,16 +7,26 @@ mkdir -p {{ tapisdatadir }}/files/rabbitmq
 mkdir -p {{ tapisdatadir }}/files/postgres
 mkdir -p {{ tapisdatadir }}/files/minio
 mkdir -p {{ tapisdatadir }}/files/irods
-
 
-kubectl apply -f files-config.yml
-kubectl apply -f service.yml 
 kubectl apply -f configmap.yml
-kubectl apply -f pvc.yml
-kubectl apply -f rabbitmq-pvc.yml
-kubectl apply -f postgres.yml 
-kubectl wait --for=condition=available deploy/files-postgres
-kubectl apply -f rabbitmq.yml 
-kubectl wait --for=condition=available deploy/files-rabbitmq
-kubectl apply -f api.yml
-kubectl apply -f workers.yml
+kubectl apply -f files-config.yml
+
+pushd ./postgres
+./burnup
+popd
+
+pushd ./pgadmin
+./burnup
+popd
+
+pushd ./rabbitmq
+./burnup
+popd
+
+pushd ./api
+./burnup
+popd
+
+pushd ./worker
+./burnup
+popd

playbooks/roles/files/templates/kube/files-config.yml

@@ -6,4 +6,8 @@ data:
   "service_site_url": "{{files_service_url}}"
   "service_tenant_id": "{{files_service_tenant_id}}"
   "site_id": "{{files_service_site_id}}"
-  "service_name": "{{files_service_name}}"
+  "service_name": "{{files_service_name}}"
+{% if systems_globus_client_id is defined %}
+  "globus_client_id": "{{systems_globus_client_id}}"
+{% endif %}
+