infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

koschei: move to ocp4

Browse source
This commit is contained in:
Mikolaj Izdebski 2022-06-24 06:44:38 +02:00
parent 5d078537e5
commit 8a586defbc
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/include/proxies-reverseproxy.yml
View file

@ -502,9 +502,9 @@
website: koschei.fedoraproject.org website: koschei.fedoraproject.org
destname: koschei destname: koschei
balancer_name: app-os balancer_name: app-os
balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}" balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
targettype: openshift targettype: openshift
ocp4: false ocp4: true
keephost: true keephost: true
tags: koschei tags: koschei

2
playbooks/openshift-apps/koschei.yml
View file

@ -1,5 +1,5 @@
- name: provision koschei - name: provision koschei
hosts: os_masters[0]:os_masters_stg[0] hosts: os_control[0]:os_control_stg[0]
user: root user: root
gather_facts: False gather_facts: False

2
roles/openshift-apps/koschei/templates/admin-deployment.yml
View file

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: admin - name: admin
image: docker-registry.default.svc:5000/koschei/koschei:latest image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
command: ["/usr/bin/sleep", "infinity"] command: ["/usr/bin/sleep", "infinity"]
env: env:
- name: SUDO_USER - name: SUDO_USER

2
roles/openshift-apps/koschei/templates/backend-deployment.yml
View file

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: {{service}} - name: {{service}}
image: docker-registry.default.svc:5000/koschei/koschei:latest image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
command: [/usr/bin/koschei-{{service}}] command: [/usr/bin/koschei-{{service}}]
env: env:
- name: SUDO_USER - name: SUDO_USER

4
roles/openshift-apps/koschei/templates/cronjob.yml
View file

@ -1,4 +1,4 @@
apiVersion: batch/v1beta1 apiVersion: batch/v1
kind: CronJob kind: CronJob
metadata: metadata:
name: "cron-{{name}}" name: "cron-{{name}}"
@ -11,7 +11,7 @@ spec:
spec: spec:
containers: containers:
- name: "cron-{{name}}" - name: "cron-{{name}}"
image: "docker-registry.default.svc:5000/koschei/koschei:latest" image: "image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest"
command: ["/bin/bash", "-euxc", "{{command}}"] command: ["/bin/bash", "-euxc", "{{command}}"]
env: env:
- name: SUDO_USER - name: SUDO_USER

2
roles/openshift-apps/koschei/templates/frontend-deployment.yml
View file

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: frontend - name: frontend
image: docker-registry.default.svc:5000/koschei/koschei:latest image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
command: [/usr/bin/koschei-frontend] command: [/usr/bin/koschei-frontend]
ports: ports:
- containerPort: 8080 - containerPort: 8080

2
roles/openshift-apps/koschei/templates/job.yml
View file

@ -7,7 +7,7 @@ spec:
spec: spec:
containers: containers:
- name: "job-{{name}}" - name: "job-{{name}}"
image: "docker-registry.default.svc:5000/koschei/koschei:latest" image: "image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest"
command: ["/bin/bash", "-euxc", "{{command}}"] command: ["/bin/bash", "-euxc", "{{command}}"]
env: env:
- name: SUDO_USER - name: SUDO_USER