SDK update (cloud-bulldozer#353)

mulbc · web-flow · commit 38e1aca3dce7 · 2020-06-05T11:45:08.000-04:00
Update Operator framework from 0.17.0 to 0.17.1
This is now based on ubi8 - thus we need the CentOS AppStream to install redis

Resolves #2648
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,18 +1,16 @@
-FROM quay.io/operator-framework/ansible-operator:v0.17.0
+FROM quay.io/operator-framework/ansible-operator:v0.17.1
+USER root
 
 COPY requirements.yml ${HOME}/requirements.yml
-COPY image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
 RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
  && chmod -R ug+rwx ${HOME}/.ansible
 
-USER root
-RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
-
-# Temporally workaround to fix https://github.com/operator-framework/operator-sdk/issues/2648
-RUN ln -s ${HOME}/.ansible /.ansible
+RUN rpm --nodeps -i http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-repos-8.1-1.1911.0.9.el8.x86_64.rpm http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8.1-1.1911.0.7.el8.noarch.rpm
+RUN dnf install -y --nodocs redis && dnf clean all
 
 COPY group_vars/ ${HOME}/group_vars/
 COPY roles/ ${HOME}/roles/
+COPY meta/ ${HOME}/meta/
 COPY watches.yaml ${HOME}/watches.yaml
 COPY playbook.yml ${HOME}/playbook.yml
 USER 1001
diff --git a/image_resources/centos8-appstream.repo b/image_resources/centos8-appstream.repo
diff --git a/meta/main.yml b/meta/main.yml
@@ -0,0 +1,3 @@
+collections:
+- community.kubernetes
+- operator_sdk.util
diff --git a/playbook.yml b/playbook.yml
@@ -1,4 +1,6 @@
 - hosts: localhost
+  collections:
+   - operator_sdk.util
   gather_facts: no
   tasks:
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+collections:`
	`2`	`+- community.kubernetes`
	`3`	`+- operator_sdk.util`