Skip to content

Commit 8098301

Browse files
committed
ecr lifecycle policy updates
1 parent 22da7b3 commit 8098301

File tree

5 files changed

+34
-63
lines changed

5 files changed

+34
-63
lines changed

ansible/build-ecs-proxies.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@
2020

2121
roles:
2222
- setup-facts
23-
- build-ecs-proxies
24-
- ecr-lifecycle-policy
23+
- build-ecs-proxies

ansible/deploy-ecs-proxies.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,4 @@
4545

4646
roles:
4747
- setup-facts
48-
- deploy-ecs-proxies
49-
50-
# - role: ecr-lifecycle-policy
51-
# when: RELEASE_RELEASEID is defined and RELEASE_RELEASEID != ""
48+
- deploy-ecs-proxies

ansible/roles/build-ecs-proxies/tasks/build-container.yml

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,35 @@
3232
cmd: "docker push {{ image_name }}"
3333
when: build_result.rc == 0
3434

35-
# - name: Get existing lifecycle policy JSON for {{ service_id }}_{{ item }}
36-
# ansible.builtin.command: >
37-
# {{ aws_cmd }} ecr get-lifecycle-policy
38-
# --repository-name {{ service_id }}_{{ item }}
39-
# --query 'lifecyclePolicyText'
40-
# --output text
41-
# register: existing_policy
42-
# failed_when: false
43-
# changed_when: false
44-
45-
# - name: Read lifecycle policy from the local file
46-
# ansible.builtin.slurp:
47-
# src: "{{ role_path }}/files/ecr_lifecycle.json"
48-
# register: desired_policy_raw
49-
50-
# - name: Decode lifecycle policy file
51-
# set_fact:
52-
# desired_policy: "{{ desired_policy_raw.content | b64decode }}"
53-
54-
# - name: Apply lifecycle policy to ecr {{ service_id }}_{{ item }} if different
55-
# ansible.builtin.command: >
56-
# {{ aws_cmd }} ecr put-lifecycle-policy
57-
# --repository-name {{ service_id }}_{{ item }}
58-
# --lifecycle-policy-text file://{{ role_path }}/files/ecr_lifecycle.json
59-
# when: existing_policy.stdout != desired_policy and build_result.rc == 0
35+
- name: Get existing lifecycle policy JSON for {{ service_id }}_{{ item }}
36+
ansible.builtin.command: >
37+
{{ aws_cmd }} ecr get-lifecycle-policy
38+
--repository-name {{ service_id }}_{{ item }}
39+
--query 'lifecyclePolicyText'
40+
--output text
41+
register: existing_policy_raw
42+
failed_when: false
43+
changed_when: false
44+
45+
- name: Parse existing lifecycle policy JSON
46+
set_fact:
47+
existing_policy_json: "{{ existing_policy_raw.stdout | default('{}') | from_json }}"
48+
when: existing_policy_raw.stdout != ""
49+
50+
- name: Read lifecycle policy from the local file
51+
ansible.builtin.slurp:
52+
src: "{{ role_path }}/files/ecr_lifecycle.json"
53+
register: desired_policy_raw
54+
55+
- name: Decode lifecycle policy file
56+
set_fact:
57+
desired_policy_json: "{{ desired_policy_raw.content | b64decode | from_json }}"
58+
59+
- name: Apply lifecycle policy to ecr {{ service_id }}_{{ item }} if different
60+
ansible.builtin.command: >
61+
{{ aws_cmd }} ecr put-lifecycle-policy
62+
--repository-name {{ service_id }}_{{ item }}
63+
--lifecycle-policy-text file://{{ playbook_dir }}/../../common/a-management-utils-3/ecr-lifecycle/ecr_lifecycle.json
64+
when:
65+
- existing_policy_json != desired_policy_json
66+
- env != "prod" or prod_lifecycle_update_allowed

ansible/roles/ecr-lifecycle-policy/tasks/main.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

ansible/roles/ecr-lifecycle-policy/tasks/files/ecr_lifecycle.json renamed to ecr-lifecycle/ecr_lifecycle.json

File renamed without changes.

0 commit comments

Comments
 (0)