remove the 'openshift' python package

and the community.kubernetes collection that requires it Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · Jun 28, 2023 · d703c27 · d703c27
1 parent b794fe9
commit d703c27
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 388 deletions.
diff --git a/images/ansible-operator-2.11-preview/Pipfile b/images/ansible-operator-2.11-preview/Pipfile
@@ -7,7 +7,6 @@ name = "pypi"
 ansible-runner = "~=1.4.7"
 ansible-runner-http = "==1.0.0"
 ipaddress = "==1.0.23"
-openshift = "~=0.13.0"
 jmespath = "==0.10.0"
 cryptography = "==3.3.2"
 ansible-core = "~=2.11.0"

diff --git a/images/ansible-operator-2.11-preview/Pipfile.lock b/images/ansible-operator-2.11-preview/Pipfile.lock
diff --git a/images/ansible-operator/Dockerfile b/images/ansible-operator/Dockerfile
@@ -17,7 +17,7 @@ COPY . .
 RUN GOOS=linux GOARCH=$TARGETARCH make build/ansible-operator
 
 # Final image.
-FROM quay.io/operator-framework/ansible-operator-base:master-50c6ac03746ff4edf582feb9a71d2a7ea6ae6c40
+FROM quay.io/operator-framework/ansible-operator-base:dev
 
 ENV HOME=/opt/ansible \
     USER_NAME=ansible \

diff --git a/images/ansible-operator/Pipfile b/images/ansible-operator/Pipfile
@@ -7,7 +7,6 @@ name = "pypi"
 ansible-runner = "~=2.0.2"
 ansible-runner-http = "~=1.0.0"
 ipaddress = "==1.0.23"
-openshift = "~=0.13.0"
 ansible = "~=2.9.15"
 jmespath = "==0.10.0"
 cryptography = "==3.3.2"

diff --git a/images/ansible-operator/Pipfile.lock b/images/ansible-operator/Pipfile.lock
diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/requirements.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/requirements.go
@@ -35,8 +35,6 @@ func (f *RequirementsYml) SetTemplateDefaults() error {
 
 const requirementsYmlTmpl = `---
 collections:
-  - name: community.kubernetes
-    version: "2.0.1"
   - name: operator_sdk.util
     version: "0.4.0"
   - name: kubernetes.core

diff --git a/testdata/ansible/memcached-operator/requirements.yml b/testdata/ansible/memcached-operator/requirements.yml
@@ -1,7 +1,5 @@
 ---
 collections:
-  - name: community.kubernetes
-    version: "2.0.1"
   - name: operator_sdk.util
     version: "0.4.0"
   - name: kubernetes.core