Skip to content

Commit

Permalink
Merge pull request openshift#9060 from alvaroaleman/configresolver
Browse files Browse the repository at this point in the history
Redirect config-resolver to app.ci
  • Loading branch information
openshift-merge-robot authored May 13, 2020
2 parents 90e461c + 58b40aa commit 1da67ff
Show file tree
Hide file tree
Showing 5 changed files with 431 additions and 238 deletions.
2 changes: 2 additions & 0 deletions clusters/app.ci/ci-operator-configresolver/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
approvers:
- dptp
3 changes: 3 additions & 0 deletions clusters/app.ci/ci-operator-configresolver/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ci-operator-configresolver

This directory contains the manifests required to run the ci-operator-configresolver in the CI cluster.
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
kind: List
apiVersion: v1
items:
- kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
name: ci-operator-configresolver
namespace: ci
spec:
lookupPolicy:
local: true
tags:
- name: latest
importPolicy:
scheduled: true
from:
kind: DockerImage
name: registry.svc.ci.openshift.org/ci/ci-operator-configresolver
- apiVersion: v1
kind: Service
metadata:
namespace: ci
labels:
app: prow
component: ci-operator-configresolver
name: ci-operator-configresolver
spec:
ports:
- name: main
port: 80
protocol: TCP
targetPort: main
- name: ui
port: 8082
protocol: TCP
targetPort: ui
- name: metrics
port: 9090
protocol: TCP
targetPort: metrics
selector:
app: prow
component: ci-operator-configresolver
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
app: prow
component: ci-operator-configresolver
name: ci-operator-configresolver-ui
namespace: ci
spec:
tls:
insecureEdgeTerminationPolicy: Redirect
termination: edge
port:
targetPort: ui
to:
kind: Service
name: ci-operator-configresolver
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
app: prow
component: ci-operator-configresolver
name: ci-operator-configresolver
namespace: ci
spec:
port:
targetPort: main
to:
kind: Service
name: ci-operator-configresolver
- apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: ci-operator-configresolver
namespace: prow-monitoring
labels:
app: prow
component: ci-operator-configresolver
prow-app: ci-operator-configresolver
spec:
endpoints:
- interval: 30s
port: metrics
scheme: http
namespaceSelector:
matchNames:
- ci
selector:
matchLabels:
app: prow
component: ci-operator-configresolver
- apiVersion: apps/v1
kind: Deployment
metadata:
namespace: ci
name: ci-operator-configresolver
annotations:
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"ci-operator-configresolver:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"ci-operator-configresolver\")].image"}]'
spec:
replicas: 3
strategy:
type: RollingUpdate
selector:
matchLabels:
app: prow
component: ci-operator-configresolver
template:
metadata:
labels:
app: prow
component: ci-operator-configresolver
spec:
containers:
- name: ci-operator-configresolver
image: ci-operator-configresolver:latest
args:
- -config=/etc/configs
- -registry=/etc/registry
- -jobs=/etc/job-config
- -prow-config=/etc/config/config.yaml
- -flat-registry
- -log-level=debug
- -cycle=2m
ports:
- name: main
containerPort: 8080
- name: ui
containerPort: 8082
- name: metrics
containerPort: 9090
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
readinessProbe:
httpGet:
path: /healthz/ready
port: 8081
initialDelaySeconds: 10
periodSeconds: 3
timeoutSeconds: 600
volumeMounts:
- name: config
mountPath: /etc/config
readOnly: true
- name: registry
mountPath: /etc/registry
readOnly: true
- name: master
mountPath: /etc/configs/master
readOnly: true
- name: misc
mountPath: /etc/configs/misc
readOnly: true
- name: release-3x
mountPath: /etc/configs/release-3.x
readOnly: true
- name: release-41
mountPath: /etc/configs/release-4.1
readOnly: true
- name: release-42
mountPath: /etc/configs/release-4.2
readOnly: true
- name: release-43
mountPath: /etc/configs/release-4.3
readOnly: true
- name: release-44
mountPath: /etc/configs/release-4.4
readOnly: true
- name: release-45
mountPath: /etc/configs/release-4.5
readOnly: true
- name: release-46
mountPath: /etc/configs/release-4.6
readOnly: true
- name: release-47
mountPath: /etc/configs/release-4.7
readOnly: true
- name: job-config-misc
mountPath: /etc/job-config/misc
readOnly: true
- name: job-config-master
mountPath: /etc/job-config/master
readOnly: true
- name: job-config-3x
mountPath: /etc/job-config/3.x
readOnly: true
- name: job-config-41
mountPath: /etc/job-config/4.1
readOnly: true
- name: job-config-42
mountPath: /etc/job-config/4.2
readOnly: true
- name: job-config-43
mountPath: /etc/job-config/4.3
readOnly: true
- name: job-config-44
mountPath: /etc/job-config/4.4
readOnly: true
- name: job-config-45
mountPath: /etc/job-config/4.5
readOnly: true
- name: job-config-46
mountPath: /etc/job-config/4.6
readOnly: true
- name: job-config-47
mountPath: /etc/job-config/4.7
readOnly: true
resources:
requests:
memory: "2Gi"
cpu: "200m"
volumes:
- name: config
configMap:
name: config
- name: registry
configMap:
name: step-registry
- name: master
configMap:
name: ci-operator-master-configs
- name: misc
configMap:
name: ci-operator-misc-configs
- name: release-3x
configMap:
name: ci-operator-3.x-configs
- name: release-41
configMap:
name: ci-operator-4.1-configs
- name: release-42
configMap:
name: ci-operator-4.2-configs
- name: release-43
configMap:
name: ci-operator-4.3-configs
- name: release-44
configMap:
name: ci-operator-4.4-configs
- name: release-45
configMap:
name: ci-operator-4.5-configs
- name: release-46
configMap:
name: ci-operator-4.6-configs
- name: release-47
configMap:
name: ci-operator-4.7-configs
- name: job-config-misc
configMap:
name: job-config-misc
- name: job-config-master
configMap:
name: job-config-master
- name: job-config-3x
configMap:
name: job-config-3.x
- name: job-config-41
configMap:
name: job-config-4.1
- name: job-config-42
configMap:
name: job-config-4.2
- name: job-config-43
configMap:
name: job-config-4.3
- name: job-config-44
configMap:
name: job-config-4.4
- name: job-config-45
configMap:
name: job-config-4.5
- name: job-config-46
configMap:
name: job-config-4.6
- name: job-config-47
configMap:
name: job-config-4.7
Loading

0 comments on commit 1da67ff

Please sign in to comment.