Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Merge pull request #33 from RafalSkolasinski/bump_knative
Browse files Browse the repository at this point in the history
bump knative to 0.25, kfserving to 0.6.1 and force git operations
  • Loading branch information
RafalSkolasinski authored Sep 2, 2021
2 parents 3e5149e + 5608475 commit 45ae789
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 20 deletions.
1 change: 1 addition & 0 deletions roles/efk_opendistro_stack/tasks/get_resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
version: "{{ elastic_opendistro_version }}"
repo: "{{ elastic_opendistro_repo }}"
dest: "{{ inventory_dir }}/.resources/opendistro-build"
force: yes
1 change: 1 addition & 0 deletions roles/iter8/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/kfserving/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -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
16 changes: 15 additions & 1 deletion roles/knative_eventing/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
---
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"
knative_eventing_core: "{{ knative_eventing_download_url }}/{{ knative_eventing_version }}/eventing-core.yaml"
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
20 changes: 11 additions & 9 deletions roles/knative_eventing/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
10 changes: 9 additions & 1 deletion roles/knative_serving/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 3 additions & 8 deletions roles/knative_serving/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions roles/postgres_operator/tasks/get_resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
version: "{{ postgres_operator_version }}"
repo: "{{ postgres_operator_repo }}"
dest: "{{ inventory_dir }}/.resources/postgres-operator"
force: yes
1 change: 1 addition & 0 deletions roles/seldon_core/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45ae789

Please sign in to comment.