Update osbs-namespace role with latest upstream

Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-06-05 14:38:56 +02:00
parent 1bb844c9f0
commit 1791fbe385
29 changed files with 493 additions and 38 deletions

View file

@ -69,11 +69,13 @@
- name: osbs-custom-build-readwrite
role: system:build-strategy-custom
yaml_version: v1
users: "{{ osbs_readwrite_users }}"
groups: "{{ osbs_readwrite_groups }}"
- name: osbs-custom-build-admin
role: system:build-strategy-custom
yaml_version: v1
users: "{{ osbs_admin_users }}"
groups: "{{ osbs_admin_groups }}"
@ -85,6 +87,13 @@
role: system:build-strategy-custom
serviceaccounts: "{{ osbs_service_accounts }}"
- name: osbs-cluster-reader
role: cluster-reader
yaml_version: v1
type: ClusterRoleBinding
users: "{{ osbs_cluster_reader_users }}"
groups: "{{ osbs_cluster_reader_groups }}"
register: yaml_rolebindings
when: osbs_is_admin
tags:

View file

@ -17,6 +17,25 @@
tags:
- oc
- name: generate reactor config maps
template:
src: reactor-config-map.yml.j2
dest: "{{ osbs_openshift_home }}/{{ inventory_hostname }}-{{ osbs_namespace }}-{{ item.name }}.yml"
with_items: "{{ osbs_reactor_config_maps | with_isolated_workers }}"
register: yaml_reactor_config_maps
tags:
- oc
- name: create reactor config maps
shell: >
oc --namespace={{ osbs_namespace }} create configmap {{ item.item.name }} \
--from-file='config.yaml'={{ item.dest }} --dry-run -o yaml | \
oc --namespace={{ osbs_namespace }} replace --force -f -
when: item.changed
with_items: "{{ yaml_reactor_config_maps.results }}"
tags:
- oc
# Setup imagestream
- name: copy imagestream
template:
@ -42,6 +61,7 @@
- name: update imagestream tag
command: >
oc import-image {{ osbs_buildroot_imagestream }}:{{ osbs_buildroot_imagestream_live_tag }}
--namespace={{ osbs_namespace }}
--from {{ osbs_buildroot_repository }}:{{ osbs_buildroot_imagestream_live_tag }}
{{ " --insecure" if osbs_insecure_repository else ''}}
environment: "{{ osbs_environment }}"