From b9a049c4c2433c5706f0c0b7ce685ded1e705860 Mon Sep 17 00:00:00 2001 From: Matthieu Huguet Date: Wed, 15 Jan 2020 12:22:58 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(playbook)=20use=20the=20k8s=5Finfo?= =?UTF-8?q?=20module=20instead=20k8s=5Ffacts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ansible module `k8s_facts` is deprecated in ansible 2.9. It has been renamed to `k8s_info`. --- CHANGELOG.md | 4 ++++ create_redirect.yml | 2 +- delete_project.yml | 2 +- tasks/check_app_secrets.yml | 2 +- tasks/clean_app_orphans.yml | 2 +- tasks/create_app_builds.yml | 2 +- tasks/delete_app_objects_kind.yml | 4 ++-- tasks/deploy_get_stamp_from_route.yml | 4 ++-- tasks/manage_app.yml | 2 +- tasks/run_job.yml | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3b163037..016f48b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased +### Changed + +- Use the `k8s_info` module instead of the deprecated `k8s_facts` module + ### Fixed - Avoid downtime during a switch or rollback diff --git a/create_redirect.yml b/create_redirect.yml index 41f15c269..168609303 100644 --- a/create_redirect.yml +++ b/create_redirect.yml @@ -50,7 +50,7 @@ # Check if the nginx service already exists and recreate it only if not # (parts of an OpenShift Service definition are immutable). - name: Check if the redirect nginx service already exists - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "Service" diff --git a/delete_project.yml b/delete_project.yml index 9a0b14dbe..508852c8e 100644 --- a/delete_project.yml +++ b/delete_project.yml @@ -18,7 +18,7 @@ # We must check if the project exists first. Without this condition, k8s # will try to delete a missing project and returns a 403 ¯\_(ツ)_/¯ - name: Check if project exists - k8s_facts: + k8s_info: api_version: v1 kind: Project field_selectors: diff --git a/tasks/check_app_secrets.yml b/tasks/check_app_secrets.yml index 92ce305b1..7b2f42e30 100644 --- a/tasks/check_app_secrets.yml +++ b/tasks/check_app_secrets.yml @@ -15,7 +15,7 @@ - name: Handle permission on Secret objects block: - name: "Get created application secrets for {{ app.name }}" - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: Secret diff --git a/tasks/clean_app_orphans.yml b/tasks/clean_app_orphans.yml index 26dc27da6..8a539e000 100644 --- a/tasks/clean_app_orphans.yml +++ b/tasks/clean_app_orphans.yml @@ -18,7 +18,7 @@ }}" - name: "Select objects (CM + pods) for app {{ app.name }}" - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "{{ item }}" diff --git a/tasks/create_app_builds.yml b/tasks/create_app_builds.yml index c2555ecf9..0bc6924cc 100644 --- a/tasks/create_app_builds.yml +++ b/tasks/create_app_builds.yml @@ -24,7 +24,7 @@ tags: build - name: Wait for target images to be available - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "ImageStreamTag" diff --git a/tasks/delete_app_objects_kind.yml b/tasks/delete_app_objects_kind.yml index ad2561997..ca389d0c5 100644 --- a/tasks/delete_app_objects_kind.yml +++ b/tasks/delete_app_objects_kind.yml @@ -1,6 +1,6 @@ # Delete a kind of objects for the targeted deployment_stamp - name: Lookup {{ kind }} to delete with deployment_stamp {{ targeted_deployment_stamp }} for app {{ app.name }} - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "{{ kind }}" @@ -21,7 +21,7 @@ loop_var: object - name: Wait for objects of kind {{ kind }} to be deleted - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "{{ kind }}" diff --git a/tasks/deploy_get_stamp_from_route.yml b/tasks/deploy_get_stamp_from_route.yml index 67c66fa90..56a64b902 100644 --- a/tasks/deploy_get_stamp_from_route.yml +++ b/tasks/deploy_get_stamp_from_route.yml @@ -7,7 +7,7 @@ # then the service targeted by this route. TThis service will be labelled with the # deploy_stamp we are looking for. - name: Get route for application {{ app.name }} with prefix {{ prefix }} - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "Route" @@ -18,7 +18,7 @@ when: routes | length > 0 and app.settings.is_blue_green_compatible | default(True) - name: Get targeted service - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "Service" diff --git a/tasks/manage_app.yml b/tasks/manage_app.yml index 4a9c27600..098568f0c 100644 --- a/tasks/manage_app.yml +++ b/tasks/manage_app.yml @@ -76,7 +76,7 @@ when: app.settings.is_blue_green_compatible | default(True) == True - name: Wait for pods to be running - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "Pod" diff --git a/tasks/run_job.yml b/tasks/run_job.yml index e9a0da43a..0d6482932 100644 --- a/tasks/run_job.yml +++ b/tasks/run_job.yml @@ -15,7 +15,7 @@ - job - name: Wait for job completion - k8s_facts: + k8s_info: api_version: "v1" namespace: "{{ project_name }}" kind: "Job"