Merge pull request #5164 from shanemcd/fix-container-groups-upstream

Fix container groups in AWX image

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

installer/roles/image_build/files/google-cloud-sdk.repo

@@ -0,0 +1,8 @@
+[google-cloud-sdk]
+name=Google Cloud SDK
+baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
+       https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg

installer/roles/image_build/tasks/main.yml

@@ -130,6 +130,13 @@
     mode: '0700'
   delegate_to: localhost
 
+- name: Stage google-cloud-sdk.repo
+  copy:
+    src: google-cloud-sdk.repo
+    dest: "{{ docker_base_path }}/google-cloud-sdk.repo"
+    mode: '0700'
+  delegate_to: localhost
+
 - name: Stage supervisor.conf
   copy:
     src: supervisor.conf

installer/roles/image_build/templates/Dockerfile.j2

@@ -125,6 +125,14 @@ RUN chmod +rx /usr/bin/launch_awx.sh && \
     chmod +rx /usr/bin/launch_awx_task.sh && \
     chmod +rx /usr/bin/config-watcher
 
+# Install OpenShift CLI
+RUN cd /usr/local/bin && \
+    curl -L https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz | \
+    tar -xz --strip-components=1 --wildcards --no-anchored 'oc'
+
+ADD google-cloud-sdk.repo /etc/yum.repos.d/
+RUN yum install -y kubectl
+
 RUN find /var/lib/awx -not -path '/var/lib/awx/venv*' | xargs chgrp root
 RUN find /var/lib/awx -not -path '/var/lib/awx/venv*' | xargs chmod g+w
 

installer/roles/image_push/tasks/main.yml

@@ -9,9 +9,6 @@
   delegate_to: localhost
 
 - name: Remove local images to ensure proper push behavior
-  # TODO: this code will not be necessary if and when docker_image can be configured to push if the image
-  # Already exists locally
-  # Pull request: https://github.com/ansible/ansible/pull/31863
   block:
     - name: Remove web image
       docker_image:
@@ -25,7 +22,6 @@
         tag: "{{ awx_version }}"
         state: absent
   delegate_to: localhost
-  when: docker_remove_local_images|default(False)|bool
 
 - name: Tag and Push Container Images
   block: