diff --git a/roles/efk_opendistro_stack/tasks/get_resources.yaml b/roles/efk_opendistro_stack/tasks/get_resources.yaml index 9faf352..64453d4 100644 --- a/roles/efk_opendistro_stack/tasks/get_resources.yaml +++ b/roles/efk_opendistro_stack/tasks/get_resources.yaml @@ -4,3 +4,4 @@ version: "{{ elastic_opendistro_version }}" repo: "{{ elastic_opendistro_repo }}" dest: "{{ inventory_dir }}/.resources/opendistro-build" + force: yes diff --git a/roles/iter8/tasks/main.yaml b/roles/iter8/tasks/main.yaml index 30f3fa1..5436ba8 100644 --- a/roles/iter8/tasks/main.yaml +++ b/roles/iter8/tasks/main.yaml @@ -4,6 +4,7 @@ version: "{{ iter8_version }}" repo: "{{ iter8_repo }}" dest: "{{ inventory_dir }}/.resources/iter8" + force: yes when: iter8_source_dir is undefined - name: Set Iter8 Directory diff --git a/roles/kfserving/defaults/main.yaml b/roles/kfserving/defaults/main.yaml index b876bf8..1cfe6de 100644 --- a/roles/kfserving/defaults/main.yaml +++ b/roles/kfserving/defaults/main.yaml @@ -1,5 +1,5 @@ --- -kfserving_version: v0.6.0 +kfserving_version: v0.6.1 kfserving_yaml: https://github.com/kubeflow/kfserving/releases/download/{{ kfserving_version }}/kfserving.yaml kfserving_wait_for_deployments: true diff --git a/roles/knative_eventing/defaults/main.yaml b/roles/knative_eventing/defaults/main.yaml index f66358c..682234b 100644 --- a/roles/knative_eventing/defaults/main.yaml +++ b/roles/knative_eventing/defaults/main.yaml @@ -1,5 +1,5 @@ --- -knative_eventing_version: v0.22.0 +knative_eventing_version: v0.25.0 knative_eventing_download_url: "https://github.com/knative/eventing/releases/download" knative_eventing_crds: "{{ knative_eventing_download_url }}/{{ knative_eventing_version }}/eventing-crds.yaml" @@ -7,8 +7,22 @@ knative_eventing_core: "{{ knative_eventing_download_url }}/{{ knative_eventing_ knative_eventing_channel: "{{ knative_eventing_download_url }}/{{ knative_eventing_version }}/in-memory-channel.yaml" knative_eventing_broker: "{{ knative_eventing_download_url }}/{{ knative_eventing_version }}/mt-channel-broker.yaml" +# workaround for: https://github.com/ansible-collections/kubernetes.core/issues/189 +# until: https://github.com/yaml/pyyaml/pull/394 is merged +knative_eventing_workaround_issue_189: true + knative_eventing_wait_for_deployments: true knative_eventing_create_default_broker: false knative_eventing_default_broker_name: default knative_eventing_default_broker_namespace: default + +knative_eventing_wait_for_deployments_list: + - eventing-controller + - eventing-webhook + - imc-controller + - imc-dispatcher + - mt-broker-controller + - mt-broker-filter + - mt-broker-ingress + - pingsource-mt-adapter diff --git a/roles/knative_eventing/tasks/main.yaml b/roles/knative_eventing/tasks/main.yaml index 2ed565d..4d4752a 100644 --- a/roles/knative_eventing/tasks/main.yaml +++ b/roles/knative_eventing/tasks/main.yaml @@ -8,6 +8,16 @@ - "{{ knative_eventing_core }}" - "{{ knative_eventing_channel }}" - "{{ knative_eventing_broker }}" + when: (knative_eventing_workaround_issue_189 | bool) == false + +- name: Install Knative Eventing (direct kubectl to workarond issue 189) + shell: "kubectl apply -f {{ item }}" + with_items: + - "{{ knative_eventing_crds }}" + - "{{ knative_eventing_core }}" + - "{{ knative_eventing_channel }}" + - "{{ knative_eventing_broker }}" + when: knative_eventing_workaround_issue_189 | bool - name: Wait for KNative Eventing deployments kubernetes.core.k8s_info: @@ -20,15 +30,7 @@ name: "{{ item }}" namespace: knative-eventing wait_timeout: 360 - with_items: - - eventing-controller - - eventing-webhook - - imc-controller - - imc-dispatcher - - mt-broker-controller - - mt-broker-filter - - mt-broker-ingress - - pingsource-mt-adapter + with_items: "{{ knative_eventing_wait_for_deployments_list }}" when: knative_eventing_wait_for_deployments | bool - name: Add tag resolution disabled repositories diff --git a/roles/knative_serving/defaults/main.yaml b/roles/knative_serving/defaults/main.yaml index 0f72f57..07306c7 100644 --- a/roles/knative_serving/defaults/main.yaml +++ b/roles/knative_serving/defaults/main.yaml @@ -1,8 +1,16 @@ --- -knative_serving_version: v0.22.0 +knative_serving_version: v0.25.0 knative_serving_crds: "https://github.com/knative/serving/releases/download/{{ knative_serving_version }}/serving-crds.yaml" knative_serving_core: "https://github.com/knative/serving/releases/download/{{ knative_serving_version }}/serving-core.yaml" knative_serving_net_istio: "https://github.com/knative/net-istio/releases/download/{{ knative_serving_version }}/net-istio.yaml" knative_serving_wait_for_deployments: true +knative_serving_wait_for_deployments_core_list: + - activator + - autoscaler + - controller + - webhook +knative_serving_wait_for_deployments_net_list: + - net-istio-webhook + - net-istio-controller diff --git a/roles/knative_serving/tasks/main.yaml b/roles/knative_serving/tasks/main.yaml index fcf0a41..6c09d89 100644 --- a/roles/knative_serving/tasks/main.yaml +++ b/roles/knative_serving/tasks/main.yaml @@ -19,13 +19,10 @@ name: "{{ item }}" namespace: knative-serving wait_timeout: 360 - with_items: - - activator - - autoscaler - - controller - - webhook + with_items: "{{ knative_serving_wait_for_deployments_core_list }}" when: knative_serving_wait_for_deployments | bool + - name: Install Knative (Istio Networking) kubernetes.core.k8s: state: present @@ -43,7 +40,5 @@ name: "{{ item }}" namespace: knative-serving wait_timeout: 360 - with_items: - - istio-webhook - - networking-istio + with_items: "{{ knative_serving_wait_for_deployments_net_list }}" when: knative_serving_wait_for_deployments | bool diff --git a/roles/postgres_operator/tasks/get_resources.yaml b/roles/postgres_operator/tasks/get_resources.yaml index 89e97a1..7d01dfd 100644 --- a/roles/postgres_operator/tasks/get_resources.yaml +++ b/roles/postgres_operator/tasks/get_resources.yaml @@ -4,3 +4,4 @@ version: "{{ postgres_operator_version }}" repo: "{{ postgres_operator_repo }}" dest: "{{ inventory_dir }}/.resources/postgres-operator" + force: yes diff --git a/roles/seldon_core/tasks/main.yaml b/roles/seldon_core/tasks/main.yaml index ba86ce0..9c64e41 100644 --- a/roles/seldon_core/tasks/main.yaml +++ b/roles/seldon_core/tasks/main.yaml @@ -7,6 +7,7 @@ version: "{{ seldon_core_version }}" repo: "{{ seldon_core_repo }}" dest: "{{ inventory_dir }}/.resources/seldon-core" + force: yes when: seldon_core_source_dir is undefined - name: Set Seldon Core Directory