From cffa605c547de458bf439e794bc5b7e6e3de4c8d Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Thu, 30 May 2019 09:36:09 +0100 Subject: [PATCH 1/4] creates redis secret for 3scale backup --- roles/3scale/tasks/backup.yml | 9 +++++++++ roles/backup/tasks/_create_redis_secret.yml | 10 ++++++++++ roles/backup/templates/redis-secret.yml.j2 | 7 +++++++ 3 files changed, 26 insertions(+) create mode 100644 roles/backup/tasks/_create_redis_secret.yml create mode 100644 roles/backup/templates/redis-secret.yml.j2 diff --git a/roles/3scale/tasks/backup.yml b/roles/3scale/tasks/backup.yml index 244808d7a..8cbfc0eac 100644 --- a/roles/3scale/tasks/backup.yml +++ b/roles/3scale/tasks/backup.yml @@ -60,6 +60,14 @@ product_name: 3scale # Redis backup +- name: Create the redis backend credentials secret for backup + include_role: + name: backup + tasks_from: _create_redis_secret.yml + vars: + secret_name: '{{ threescale_backup_redis_secret }}' + secret_redis_host: 'system-redis.{{ threescale_namespace }}.svc' + - name: Create the 3scale Redis CronJob include_role: name: backup @@ -68,3 +76,4 @@ cronjob_name: 3scale-redis-backup component: 3scale-redis product_name: 3scale + secret_name: '{{ threescale_backup_redis_secret }}' \ No newline at end of file diff --git a/roles/backup/tasks/_create_redis_secret.yml b/roles/backup/tasks/_create_redis_secret.yml new file mode 100644 index 000000000..e56ec0866 --- /dev/null +++ b/roles/backup/tasks/_create_redis_secret.yml @@ -0,0 +1,10 @@ +--- +- template: + src: redis-secret.yml.j2 + dest: /tmp/redis-secret.yml + vars: + name: '{{ secret_name }}' + host: '{{ secret_redis_host }}' + +- name: Create Redis secret {{ secret_name }} + shell: oc apply -f /tmp/redis-secret.yml -n {{ component_backup_secret_namespace }} diff --git a/roles/backup/templates/redis-secret.yml.j2 b/roles/backup/templates/redis-secret.yml.j2 new file mode 100644 index 000000000..935215bb9 --- /dev/null +++ b/roles/backup/templates/redis-secret.yml.j2 @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ name }} +type: Opaque +stringData: + REDIS_HOST: "{{ host }}" \ No newline at end of file From 72cf122f7f64c598f123b3220ef42073459c6751 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Thu, 30 May 2019 09:39:12 +0100 Subject: [PATCH 2/4] upgrade task --- roles/3scale/tasks/upgrade.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/3scale/tasks/upgrade.yml b/roles/3scale/tasks/upgrade.yml index 5b8343d35..52690e5ce 100644 --- a/roles/3scale/tasks/upgrade.yml +++ b/roles/3scale/tasks/upgrade.yml @@ -215,4 +215,12 @@ - system-mysql - system-memcache - system-redis - - backend-redis \ No newline at end of file + - backend-redis + +- name: Create 3scale redis secret + include_role: + name: backup + tasks_from: _create_redis_secret.yml + vars: + secret_name: '{{ threescale_backup_redis_secret }}' + secret_redis_host: 'system-redis.{{ threescale_namespace }}.svc' \ No newline at end of file From c0169a3c9d8227dfb33b59e0ccf5f416e6c0c251 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Thu, 30 May 2019 10:51:36 +0100 Subject: [PATCH 3/4] fix defaults --- roles/3scale/defaults/main.yml | 1 + roles/3scale/tasks/backup.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/3scale/defaults/main.yml b/roles/3scale/defaults/main.yml index a979bea3b..d49a99757 100644 --- a/roles/3scale/defaults/main.yml +++ b/roles/3scale/defaults/main.yml @@ -52,3 +52,4 @@ wildcard_policy_param: "" # Backups threescale_backup_mysql_secret: threescale-mysql-secret threescale_backup_postgres_secret: threescale-postgres-secret +threescale_backup_redis_secret: threescale-redis-secret diff --git a/roles/3scale/tasks/backup.yml b/roles/3scale/tasks/backup.yml index 8cbfc0eac..9625c20f6 100644 --- a/roles/3scale/tasks/backup.yml +++ b/roles/3scale/tasks/backup.yml @@ -76,4 +76,4 @@ cronjob_name: 3scale-redis-backup component: 3scale-redis product_name: 3scale - secret_name: '{{ threescale_backup_redis_secret }}' \ No newline at end of file + component_secret_name: '{{ threescale_backup_redis_secret }}' \ No newline at end of file From 0e20407128a98e64143f749f79a802bb53fa2276 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Thu, 30 May 2019 16:08:59 +0100 Subject: [PATCH 4/4] backup container image update --- inventories/group_vars/all/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/manifest.yaml b/inventories/group_vars/all/manifest.yaml index 448f189ea..7735114d3 100644 --- a/inventories/group_vars/all/manifest.yaml +++ b/inventories/group_vars/all/manifest.yaml @@ -101,7 +101,7 @@ msbroker_release_tag: 'v0.0.6' msbroker_template: 'https://raw.githubusercontent.com/integr8ly/managed-service-broker/{{ msbroker_release_tag }}/templates/broker.template.yaml' # information about backups -backup_version: '1.0.6' +backup_version: '1.0.7' backup_resources_location: 'https://raw.githubusercontent.com/integr8ly/backup-container-image/{{ backup_version }}/templates/openshift' backup_image: quay.io/integreatly/backup-container:{{ backup_version }} backup_schedule: '30 2 * * *'