Drop coreos and containers openshift projects.
coreos moved to github.io containers is not used for now. Also adjust master.yml.
This commit is contained in:
parent
c36e9c1edb
commit
09fee6e297
11 changed files with 1 additions and 362 deletions
|
@ -117,12 +117,11 @@
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/waiverdb.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/waiverdb.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/coreos.yml
|
|
||||||
# These need work to finish and complete and are all stg currently.
|
# These need work to finish and complete and are all stg currently.
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/koschei.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/koschei.yml
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/modernpaste.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/modernpaste.yml
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/rats.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/rats.yml
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/release-monitoring.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/release-monitoring.yml
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/transtats.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/transtats.yml
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,59 +0,0 @@
|
||||||
- name: make the app be real
|
|
||||||
hosts: os-masters[0]:os-masters-stg[0]
|
|
||||||
user: root
|
|
||||||
gather_facts: False
|
|
||||||
|
|
||||||
vars_files:
|
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
|
||||||
- "/srv/private/ansible/vars.yml"
|
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
|
||||||
|
|
||||||
roles:
|
|
||||||
- role: openshift/project
|
|
||||||
app: containers
|
|
||||||
description: containers.fedoraproject.org static website
|
|
||||||
appowners:
|
|
||||||
- misc
|
|
||||||
- sanja
|
|
||||||
- role: openshift/object
|
|
||||||
app: containers
|
|
||||||
template: imagestream.yml
|
|
||||||
objectname: imagestream.yml
|
|
||||||
- role: openshift/object
|
|
||||||
app: containers
|
|
||||||
template: buildconfig.yml
|
|
||||||
objectname: buildconfig.yml
|
|
||||||
|
|
||||||
- role: openshift/start-build
|
|
||||||
app: containers
|
|
||||||
buildname: containers-build
|
|
||||||
objectname: containers-build
|
|
||||||
|
|
||||||
- role: openshift/object
|
|
||||||
app: containers
|
|
||||||
file: service.yml
|
|
||||||
objectname: service.yml
|
|
||||||
|
|
||||||
- role: openshift/route
|
|
||||||
app: containers
|
|
||||||
routename: containers
|
|
||||||
host: "containers.fedoraproject.org"
|
|
||||||
serviceport: 8080-tcp
|
|
||||||
servicename: containers
|
|
||||||
when: env == "production"
|
|
||||||
|
|
||||||
- role: openshift/route
|
|
||||||
app: containers
|
|
||||||
routename: containers
|
|
||||||
host: "containers{{ env_suffix }}.fedoraproject.org"
|
|
||||||
serviceport: 8080-tcp
|
|
||||||
servicename: containers
|
|
||||||
|
|
||||||
- role: openshift/object
|
|
||||||
app: containers
|
|
||||||
file: deploymentconfig.yml
|
|
||||||
objectname: deploymentconfig.yml
|
|
||||||
|
|
||||||
- role: openshift/rollout
|
|
||||||
app: containers
|
|
||||||
dcname: containers
|
|
|
@ -1,51 +0,0 @@
|
||||||
- name: make the app be real
|
|
||||||
hosts: os-masters[0]:os-masters-stg[0]
|
|
||||||
user: root
|
|
||||||
gather_facts: False
|
|
||||||
|
|
||||||
vars_files:
|
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
|
||||||
- "/srv/private/ansible/vars.yml"
|
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
|
||||||
|
|
||||||
roles:
|
|
||||||
- role: openshift/project
|
|
||||||
app: coreos
|
|
||||||
description: coreos.fedoraproject.org static website
|
|
||||||
appowners:
|
|
||||||
- misc
|
|
||||||
- sanja
|
|
||||||
- role: openshift/object
|
|
||||||
app: coreos
|
|
||||||
template: imagestream.yml
|
|
||||||
objectname: imagestream.yml
|
|
||||||
- role: openshift/object
|
|
||||||
app: coreos
|
|
||||||
template: buildconfig.yml
|
|
||||||
objectname: buildconfig.yml
|
|
||||||
|
|
||||||
- role: openshift/start-build
|
|
||||||
app: coreos
|
|
||||||
buildname: coreos-build
|
|
||||||
objectname: coreos-build
|
|
||||||
|
|
||||||
- role: openshift/object
|
|
||||||
app: coreos
|
|
||||||
file: service.yml
|
|
||||||
objectname: service.yml
|
|
||||||
|
|
||||||
- role: openshift/route
|
|
||||||
app: coreos
|
|
||||||
routename: coreos
|
|
||||||
host: "coreos{{ env_suffix }}.fedoraproject.org"
|
|
||||||
serviceport: 8080-tcp
|
|
||||||
servicename: coreos
|
|
||||||
|
|
||||||
- role: openshift/object
|
|
||||||
app: coreos
|
|
||||||
file: deploymentconfig.yml
|
|
||||||
objectname: deploymentconfig.yml
|
|
||||||
|
|
||||||
- role: openshift/rollout
|
|
||||||
app: coreos
|
|
||||||
dcname: coreos
|
|
|
@ -1,50 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: DeploymentConfig
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: containers
|
|
||||||
service: containers
|
|
||||||
name: containers
|
|
||||||
spec:
|
|
||||||
replicas: 2
|
|
||||||
selector:
|
|
||||||
app: containers
|
|
||||||
deploymentconfig: containers
|
|
||||||
strategy:
|
|
||||||
resources: {}
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: containers
|
|
||||||
deploymentconfig: containers
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- image: containers:latest
|
|
||||||
name: containers
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
readinessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8080
|
|
||||||
livenessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8080
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- type: ConfigChange
|
|
||||||
- type: ImageChange
|
|
||||||
imageChangeParams:
|
|
||||||
automatic: true
|
|
||||||
containerNames:
|
|
||||||
- containers
|
|
||||||
from:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: containers:latest
|
|
|
@ -1,15 +0,0 @@
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: containers
|
|
||||||
name: containers
|
|
||||||
spec:
|
|
||||||
ports:
|
|
||||||
- name: 8080-tcp
|
|
||||||
port: 8080
|
|
||||||
protocol: TCP
|
|
||||||
targetPort: 8080
|
|
||||||
selector:
|
|
||||||
app: containers
|
|
||||||
deploymentconfig: containers
|
|
|
@ -1,29 +0,0 @@
|
||||||
apiVersion: v1
|
|
||||||
kind: BuildConfig
|
|
||||||
metadata:
|
|
||||||
name: containers-build
|
|
||||||
labels:
|
|
||||||
environment: "containers"
|
|
||||||
spec:
|
|
||||||
output:
|
|
||||||
to:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: containers:latest
|
|
||||||
source:
|
|
||||||
type: Git
|
|
||||||
git:
|
|
||||||
uri: https://github.com/containers/containers.fedoraproject.org.git
|
|
||||||
strategy:
|
|
||||||
type: Source
|
|
||||||
sourceStrategy:
|
|
||||||
from:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: s2i-golang:latest
|
|
||||||
triggers:
|
|
||||||
{% if containers_github_secret is defined %}
|
|
||||||
- type: GitHub
|
|
||||||
github:
|
|
||||||
secret: "{{ containers_github_secret }}"
|
|
||||||
{% endif %}
|
|
||||||
- type: ConfigChange
|
|
||||||
- type: ImageChange
|
|
|
@ -1,28 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ImageStream
|
|
||||||
metadata:
|
|
||||||
name: containers
|
|
||||||
spec:
|
|
||||||
lookupPolicy:
|
|
||||||
local: false
|
|
||||||
status:
|
|
||||||
dockerImageRepository: ""
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ImageStream
|
|
||||||
metadata:
|
|
||||||
name: s2i-golang
|
|
||||||
spec:
|
|
||||||
lookupPolicy:
|
|
||||||
local: false
|
|
||||||
tags:
|
|
||||||
- from:
|
|
||||||
kind: DockerImage
|
|
||||||
name: quay.io/osas/s2i-golang
|
|
||||||
importPolicy: {}
|
|
||||||
name: latest
|
|
||||||
referencePolicy:
|
|
||||||
type: Source
|
|
||||||
status:
|
|
||||||
dockerImageRepository: ""
|
|
|
@ -1,50 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: DeploymentConfig
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: coreos
|
|
||||||
service: coreos
|
|
||||||
name: coreos
|
|
||||||
spec:
|
|
||||||
replicas: 2
|
|
||||||
selector:
|
|
||||||
app: coreos
|
|
||||||
deploymentconfig: coreos
|
|
||||||
strategy:
|
|
||||||
resources: {}
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: coreos
|
|
||||||
deploymentconfig: coreos
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- image: coreos:latest
|
|
||||||
name: coreos
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
readinessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8080
|
|
||||||
livenessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8080
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- type: ConfigChange
|
|
||||||
- type: ImageChange
|
|
||||||
imageChangeParams:
|
|
||||||
automatic: true
|
|
||||||
containerNames:
|
|
||||||
- coreos
|
|
||||||
from:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: coreos:latest
|
|
|
@ -1,16 +0,0 @@
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: coreos
|
|
||||||
name: coreos
|
|
||||||
spec:
|
|
||||||
ports:
|
|
||||||
- name: 8080-tcp
|
|
||||||
port: 8080
|
|
||||||
protocol: TCP
|
|
||||||
targetPort: 8080
|
|
||||||
selector:
|
|
||||||
app: coreos
|
|
||||||
deploymentconfig: coreos
|
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
apiVersion: v1
|
|
||||||
kind: BuildConfig
|
|
||||||
metadata:
|
|
||||||
name: coreos-build
|
|
||||||
labels:
|
|
||||||
environment: "coreos"
|
|
||||||
spec:
|
|
||||||
output:
|
|
||||||
to:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: coreos:latest
|
|
||||||
source:
|
|
||||||
type: Git
|
|
||||||
git:
|
|
||||||
uri: https://github.com/coreos/coreos.fedoraproject.org.git
|
|
||||||
strategy:
|
|
||||||
type: Source
|
|
||||||
sourceStrategy:
|
|
||||||
from:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: s2i-golang:latest
|
|
||||||
triggers:
|
|
||||||
{% if coreos_github_secret is defined %}
|
|
||||||
- type: GitHub
|
|
||||||
github:
|
|
||||||
secret: "{{ coreos_github_secret }}"
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
# TODO add that once it is clear on how to store the secret
|
|
||||||
# - type: GitHub
|
|
||||||
# github:
|
|
||||||
# secret: "some_coreos_github_secret"
|
|
||||||
- type: ConfigChange
|
|
||||||
- type: ImageChange
|
|
|
@ -1,28 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ImageStream
|
|
||||||
metadata:
|
|
||||||
name: coreos
|
|
||||||
spec:
|
|
||||||
lookupPolicy:
|
|
||||||
local: false
|
|
||||||
status:
|
|
||||||
dockerImageRepository: ""
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ImageStream
|
|
||||||
metadata:
|
|
||||||
name: s2i-golang
|
|
||||||
spec:
|
|
||||||
lookupPolicy:
|
|
||||||
local: false
|
|
||||||
tags:
|
|
||||||
- from:
|
|
||||||
kind: DockerImage
|
|
||||||
name: quay.io/osas/s2i-golang
|
|
||||||
importPolicy: {}
|
|
||||||
name: latest
|
|
||||||
referencePolicy:
|
|
||||||
type: Source
|
|
||||||
status:
|
|
||||||
dockerImageRepository: ""
|
|
Loading…
Add table
Add a link
Reference in a new issue