瀏覽代碼

add fix for pull-secret

Grega Bremec 1 年之前
父節點
當前提交
397fcc4ad0
共有 3 個文件被更改,包括 19 次插入2 次删除
  1. 6 0
      roles/fix-operators/files/pull-secret.yml
  2. 12 2
      roles/fix-operators/tasks/main.yml
  3. 1 0
      roles/fix-operators/vars/main.yml

文件差異過大導致無法顯示
+ 6 - 0
roles/fix-operators/files/pull-secret.yml


+ 12 - 2
roles/fix-operators/tasks/main.yml

@@ -25,16 +25,26 @@
   retries: 30
   delay: 10
 
-- name: Make sure the do280-catalog is not there
+- name: Make sure the course catalog is not there
   k8s:
     kubeconfig: tmp/kubeconfig-ocp4
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
     kind: catalogsource
     namespace: openshift-marketplace
-    name: do280-catalog
+    name: "{{ removed_catalog }}"
     state: absent
 
+- name: Make sure the pull secret will do for online sources
+  k8s:
+    kubeconfig: tmp/kubeconfig-ocp4
+    validate_certs: no
+    api_version: v1
+    kind: secret
+    namespace: openshift-config
+    name: pull-secret
+    src: files/pull-secret.yml
+
 - name: Ensure the standard catalog sources are there
   k8s:
     kubeconfig: tmp/kubeconfig-ocp4

+ 1 - 0
roles/fix-operators/vars/main.yml

@@ -2,6 +2,7 @@
 op_cat: redhat-operators
 op_pkg: amq-broker-rhel8
 desired_csv: amq-broker-operator.v7.11.0-opr-3
+removed_source: do280-catalog
 catalog_sources:
   - name: redhat-operators
     displ: Red Hat Operators

部分文件因文件數量過多而無法顯示