Merge pull request #348 from tapis-project/staging

Staging

CHANGELOG.md

@@ -2,12 +2,30 @@
 
 Notable changes between versions.
 
-## 1.5.3 
+## 1.6.0 
+
+### Service Updates
+
+- [Abaco: 1.5.0 to 1.6.0 (abaco/core-v3)](https://github.com/TACC/abaco/blob/prod-v3/CHANGELOG.md)
+- [Apps: 1.5.10 to 1.6.0 (tapis/apps)](https://github.com/tapis-project/tapis-apps/blob/dev/CHANGELOG.md)
+- [Authenticator: 1.5.1 -> 1.6.0 (tapis/authenticator, tapis/authenticator-migrations)](https://github.com/tapis-project/authenticator/blob/dev/CHANGELOG.md)
+- [Files: 1.5.10 to 1.6.0 (tapis/tapis-files, tapis/tapis-files-workers)](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md)
+- [Globus-Proxy: 1.5.0 to 1.6.0 (tapis/globus-proxy)](https://github.com/tapis-project/globus-proxy/blob/dev/CHANGELOG.md)
+- [Jobs: 1.5.10 to 1.6.0 (tapis/jobsworker, jobsmigrate, jobsapi)](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md)
+- [Meta: 1.5.10 to 1.6.0 (tapis/metaapi, tapis-meta-rh-server)](https://github.com/tapis-project/tapis-meta/blob/dev/CHANGELOG.md)
+- [Notifications: 1.5.12 to 1.6.0 (tapis/notifications, notifications-dispatcher)](https://github.com/tapis-project/tapis-notifications/blob/dev/CHANGELOG.md)
+- [Security: 1.5.10 to 1.6.0 (tapis/securitymigrate, securityadmin, securityapi, securityexport)](https://github.com/tapis-project/tapis-security/blob/dev/tapis-securityapi/CHANGELOG.md)
+- [Systems: 1.5.10 to 1.6.0 (tapis/systems)](https://github.com/tapis-project/tapis-systems/blob/dev/CHANGELOG.md)
+- Removed the stern component from monitoring
+
+
+## 1.5.3
 
 ### Services Updates
 
 - [Streams: 1.5.0 -> 1.5.1 (tapis/streams-api)](https://github.com/tapis-project/streams-api/blob/prod/CHANGELOG.md)
 - This release also fixes a bug with Streams InfluxDB data location inside the container that was causing saved data to be lost between container restarts.
+- [Pods: 1.5.0 to 1.5.3 (tapis/pods-api)](https://github.com/tapis-project/pods_service/blob/prod/CHANGELOG.md)
 
 
 ## 1.5.2

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

@@ -1,10 +1,9 @@
 actors_core_image: abaco/core-v3:{{ actors_service_version }}
 actors_grafana_image: grafana/grafana:9.4.7
-actors_prometheus_image: abaco/promv3:1.4.0
-actors_nginx_image: abaco/nginx:1.9.1
-actors_nginxk8s_image: abaco/nginxk8s:1.4.0
+actors_nginx_image: abaco/nginx:1.6.0
+actors_nginxk8s_image: abaco/nginxk8s:1.6.0
 actors_mongo_image: mongo:4.2.6
 actors_alpine_image: alpine:3.17
-actors_mongobackup_image: tapis/mongobackup:0.1
+actors_mongobackup_image: tapis/mongobackup:1.6.0
 actors_rabbitmq_image: rabbitmq:3.6.12-management
-actors_util_image: tapis/ubutil2204:1.5.0
+actors_util_image: tapis/ubutil2204:1.6.0

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.5.0
+actors_service_version: 1.6.0
 actors_storage_class: '{{ global_storage_class }}'
 actors_rabbit_pvc: actors-rabbitmq-vol01
 actors_mongo_pvc: actors-mongo-vol01
@@ -15,6 +15,8 @@ actors_mongo_tls: false
 actors_image_pull_policy: Always
 actors_host_path: develop
 actors_timeout: 60
+actors_threads: 6
+actors_processes: 8
 actors_tas_role_acct: ""
 actors_tas_role_pass: ""
 actors_mongo_init_database: null

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

@@ -239,39 +239,13 @@ services:
         networks:
             - tapis
 
-    actors-prometheus:
-        container_name: actors-prometheus
-        # build: ./images/prometheus
-        image: {{ actors_prometheus_image }}
-        # volumes:
-        #     - ./images/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-        #     - ./images/prometheus/alert.rules.yml:/etc/prometheus/alert.rules.yml
-        command:
-          - '--config.file=/etc/prometheus/prometheus.yml'
-        #   - '-storage.local.path=/prometheus'
-        # ports:
-        #     - 127.0.0.1:9090:9090
-        networks:
-            - tapis
-        depends_on:
-            - actors-mongo
-            - actors-reg
-
     actors-grafana:
         container_name: acrots-grafana
         image: {{ actors_grafana_image }}
         user: "104"
         depends_on:
-            - actors-prometheus
             - actors-mongo
             - actors-reg
-        # ports:
-        #     - "127.0.0.1:3000:3000"
-        # volumes:
-        #     - grafana_data:/var/lib/grafana
-        #     - ./images/prometheus/grafana/provisioning/:/etc/grafana/provisioning/
-        # env_file:
-        #     - ./images/prometheus/grafana/config.monitoring
         networks:
             - tapis
         restart: always
@@ -301,7 +275,6 @@ services:
         depends_on:
             - actors-mongo
             - actors-reg
-            - actors-prometheus
 
 # volumes:
 #     grafana_data: {}

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

@@ -8,4 +8,5 @@ data:
   TAS_ROLE_ACCT: "{{ actors_tas_role_acct }}"
   TAS_ROLE_PASS: "{{ actors_tas_role_pass }}"
   timeout: "{{ actors_timeout }}"
-
+  threads: "{{ actors_threads }}"
+  processes: "{{ actors_processes }}"

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

@@ -11,6 +11,7 @@ spec:
       labels:
         app: actors-mongo
     spec:
+      hostname: actors-mongo # sets static hostname rather than random k8 generated. Without mongo gets replica-set confused.
       containers:
       - name: actors-mongo
         image: {{ actors_mongo_image }}

playbooks/roles/admin/defaults/main/images.yml

@@ -1,3 +1,3 @@
-admin_util_image: tapis/ubutil2204:1.5.0
-admin_centosutil_image: tapis/centosutil:1.5.0
-admin_skadminutil_image: tapis/skadminutil:1.4.0
+admin_util_image: tapis/ubutil2204:1.6.0
+admin_centosutil_image: tapis/centosutil:1.6.0
+admin_skadminutil_image: tapis/skadminutil:1.6.0

playbooks/roles/apps/defaults/main/images.yml

@@ -1,4 +1,4 @@
-apps_api_image: tapis/apps:1.5.10
+apps_api_image: tapis/apps:1.6.0
 apps_postgres_image: postgres:12.4
 apps_pgadmin_image: dpage/pgadmin4:6.20
-apps_util_image: tapis/ubutil2204:1.5.0
+apps_util_image: tapis/ubutil2204:1.6.0

playbooks/roles/authenticator/defaults/main/images.yml

@@ -1,4 +1,4 @@
-authenticator_api_image: tapis/authenticator:1.5.1
-authenticator_migrations_image: tapis/authenticator-migrations:1.5.1
+authenticator_api_image: tapis/authenticator:1.6.0
+authenticator_migrations_image: tapis/authenticator-migrations:1.6.0
 authenticator_postgres_image: postgres:11.4
 authenticator_ldap_image: tacc/slapd:1

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

@@ -1,4 +1,4 @@
-baseburnup_tapis_deployer_version: 1.5.2
+baseburnup_tapis_deployer_version: 1.6.0
 baseburnup_service_url: "{{ global_service_url }}"
 baseburnup_vault_url: "{{ global_vault_url }}"
 

playbooks/roles/files/defaults/main/images.yml

@@ -1,10 +1,10 @@
-files_api_image: tapis/tapis-files:1.5.10
-files_workers_image: tapis/tapis-files-workers:1.5.10
+files_api_image: tapis/tapis-files:1.6.0
+files_workers_image: tapis/tapis-files-workers:1.6.0
 files_postgres_image: postgres:11
 files_migrations_image: postgres:11
 files_minio_image: minio/minio
 files_irods_provider_postgres_image: mjstealey/irods-provider-postgres:4.2.4
 files_pgadmin_image: dpage/pgadmin4:6.20
 files_rabbitmq_image: rabbitmq:3.8.11-management
 files_rabbitmq_management_image: rabbitmq:3-management-alpine
-files_util_image: tapis/ubutil2204:1.5.0
+files_util_image: tapis/ubutil2204:1.6.0

playbooks/roles/globus-proxy/defaults/main/images.yml

@@ -1 +1 @@
-globus_proxy_api_image: tapis/globus-proxy:1.5.0
+globus_proxy_api_image: tapis/globus-proxy:1.6.0

playbooks/roles/jobs/defaults/main/images.yml

@@ -1,7 +1,7 @@
-jobs_api_image: tapis/jobsapi:1.5.10
-jobs_migrations_image: tapis/jobsmigrate:1.5.10
-jobs_worker_image: tapis/jobsworker:1.5.10
+jobs_api_image: tapis/jobsapi:1.6.0
+jobs_migrations_image: tapis/jobsmigrate:1.6.0
+jobs_worker_image: tapis/jobsworker:1.6.0
 jobs_postgres_image: postgres:12.4
 jobs_pgadmin_image: dpage/pgadmin4:6.20
 jobs_rabbitmq_management_image: rabbitmq:3.8.11-management
-jobs_util_image: tapis/ubutil2204:1.5.0
+jobs_util_image: tapis/ubutil2204:1.6.0

playbooks/roles/meta/defaults/main/images.yml

@@ -1,8 +1,8 @@
-meta_api_image: tapis/metaapi:1.5.10
-meta_rh_server_image: tapis/tapis-meta-rh-server:1.5.0
-meta_mongo_exporter_image: tapis/mqe:0.1
-meta_mongo_singlenode_image: tapis/mongo-singlenode:4.4.6-bionic
-meta_mongodb_backup_image: tapis/mongodb-backup:1
-meta_mongobackup_image: tapis/mongobackup:1.5.0
+meta_api_image: tapis/metaapi:1.6.0
+meta_rh_server_image: tapis/tapis-meta-rh-server:1.6.0
+meta_mongo_exporter_image: tapis/mqe:1.6.0
+meta_mongo_singlenode_image: tapis/mongo-singlenode:1.6.0
+meta_mongodb_backup_image: tapis/mongodb-backup:1.6.0
+meta_mongobackup_image: tapis/mongobackup:1.6.0
 meta_alpine_image: alpine:3.17
-meta_util_image: tapis/ubutil2204:1.5.0
+meta_util_image: tapis/ubutil2204:1.6.0

playbooks/roles/monitoring/defaults/main/images.yml

@@ -1,10 +1,9 @@
-monitoring_stern_fluentd_image: tapis/stern-fluentd:1.5.1
-monitoring_tapis_exporter_image: tapis/exporter:1.5.0
+monitoring_tapis_exporter_image: tapis/exporter:1.6.0
 monitoring_alpine_image: alpine:3.6
 monitoring_postgres_image: bitnami/postgresql:14
 monitoring_elasticsearch_image: docker.elastic.co/elasticsearch/elasticsearch:7.17.9
 monitoring_kibana_image: docker.elastic.co/kibana/kibana:7.17.9
 monitoring_grafana_image: grafana/grafana:8.5.5
 monitoring_prometheus_image: prom/prometheus:v2.38.0
 monitoring_thanos_image: quay.io/thanos/thanos:v0.8.0
-monitoring_util_image: tapis/ubutil2204:1.5.0
+monitoring_util_image: tapis/ubutil2204:1.6.0

playbooks/roles/monitoring/templates/kube/burnup

@@ -24,9 +24,6 @@ kubectl apply -f services
 # Apps
 kubectl apply -f apps
 
-# Logging
-kubectl apply -f stern-fluentd
-
 # Initialize the DB
 kubectl create configmap monitor-init-user-configmap --from-file monitor-init-user-sh
 kubectl apply -f monitor-init-user.yml

playbooks/roles/nginx-custom-locations/templates/nginx.conf

@@ -115,7 +115,7 @@ http {
         ssl_session_timeout 1d;
         ssl_session_cache shared:MozSSL:10m;
         ssl_session_tickets off;
-        ssl_protocols TLSv1.2;
+        ssl_protocols TLSv1.2 TLSv1.3;
         ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
         ssl_prefer_server_ciphers off;
         add_header Strict-Transport-Security "max-age=63072000" always;

playbooks/roles/notifications/defaults/main/images.yml

@@ -1,6 +1,6 @@
 notifications_postgres_image: postgres:12.4
 notifications_pgadmin_image: dpage/pgadmin4:6.20
 notifications_rabbitmq_image: rabbitmq:3.8.11-management
-notifications_util_image: tapis/ubutil2204:1.5.0
-notifications_api_image: tapis/notifications:1.5.10
-notifications_dispatcher_image: tapis/notifications-dispatcher:1.5.10
+notifications_util_image: tapis/ubutil2204:1.6.0
+notifications_api_image: tapis/notifications:1.6.0
+notifications_dispatcher_image: tapis/notifications-dispatcher:1.6.0

playbooks/roles/pgrest/defaults/main/images.yml

@@ -1,3 +1,3 @@
-pgrest_api_image: tapis/pgrest-api:1.5.0
+pgrest_api_image: tapis/pgrest-api:1.6.0
 pgrest_postgres_image: postgres:13
-pgrest_util_image: tapis/ubutil2204:1.5.0
+pgrest_util_image: tapis/ubutil2204:1.6.0

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

@@ -1,7 +1,7 @@
 ---
 
 pods_service_name: pods
-pods_image_version: 1.5.0
+pods_image_version: 1.6.0
 pods_service_site_id: "{{ global_site_id }}"
 pods_service_tenant_id: admin
 pods_primary_site_admin_tenant_base_url: "{{ global_primary_site_admin_tenant_base_url }}"

playbooks/roles/pods/templates/kube/api.yml

@@ -54,7 +54,13 @@ spec:
         - name: pods-config
           mountPath: /home/tapis/config.json
           subPath: config.json
+        - name: pods-nfs-vol
+          mountPath: "/podsnfs"
       volumes:
       - name: pods-config
         configMap: 
           name: pods-config 
+      - name: pods-nfs-vol
+        nfs:
+          server: BURNUP_STATIC_NFS_IP
+          path: /

playbooks/roles/pods/templates/kube/burndown

@@ -8,11 +8,15 @@
 kubectl delete configmap pods-config
 kubectl delete configmap pods-traefik-conf
 
+
 # App
 kubectl delete -f api.yml
+kubectl delete -f health-central.yml
+kubectl delete -f traefik-proxy.yml
+
+# App - when deployed in single namespace
 kubectl delete -f spawner.yml
 kubectl delete -f health.yml
-kubectl delete -f traefik-proxy.yml
 
 # Storage
 kubectl delete -f postgres.yml