Skip to content

Commit 3ce8a3e

Browse files
liangxialiangxia
authored
DPTP-4401: Add configs for build03 (openshift#64354)
1 parent 78dcd5a commit 3ce8a3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4187
-1
lines changed

‎ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181222,6 +181222,52 @@ periodics:
181222181222
- key: sa.config-updater.build02.config
181223181223
path: kubeconfig
181224181224
secretName: config-updater
181225+
- agent: kubernetes
181226+
cluster: app.ci
181227+
decorate: true
181228+
extra_refs:
181229+
- base_ref: master
181230+
org: openshift
181231+
repo: release
181232+
interval: 12h
181233+
labels:
181234+
ci.openshift.io/build-farm: build03
181235+
ci.openshift.io/generator: cluster-init
181236+
ci.openshift.io/role: infra
181237+
name: periodic-openshift-release-master-build03-apply
181238+
spec:
181239+
containers:
181240+
- args:
181241+
- --config-dir=clusters/build-clusters/build03
181242+
- --as=
181243+
- --kubeconfig=/etc/build-farm-credentials/kubeconfig
181244+
- --confirm=true
181245+
command:
181246+
- applyconfig
181247+
env:
181248+
- name: build03_id
181249+
valueFrom:
181250+
secretKeyRef:
181251+
key: build03-id
181252+
name: build03-dex-oidc
181253+
image: applyconfig:latest
181254+
imagePullPolicy: Always
181255+
name: ""
181256+
resources:
181257+
requests:
181258+
cpu: 10m
181259+
volumeMounts:
181260+
- mountPath: /etc/build-farm-credentials
181261+
name: build-farm-credentials
181262+
readOnly: true
181263+
serviceAccountName: config-updater
181264+
volumes:
181265+
- name: build-farm-credentials
181266+
secret:
181267+
items:
181268+
- key: sa.config-updater.build03.config
181269+
path: kubeconfig
181270+
secretName: config-updater
181225181271
- agent: kubernetes
181226181272
cluster: app.ci
181227181273
decorate: true

‎ci-operator/jobs/openshift/release/openshift-release-master-postsubmits.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,50 @@ postsubmits:
133133
- key: sa.config-updater.build02.config
134134
path: kubeconfig
135135
secretName: config-updater
136+
- agent: kubernetes
137+
branches:
138+
- ^master$
139+
cluster: app.ci
140+
decorate: true
141+
labels:
142+
ci.openshift.io/build-farm: build03
143+
ci.openshift.io/generator: cluster-init
144+
ci.openshift.io/role: infra
145+
max_concurrency: 1
146+
name: branch-ci-openshift-release-master-build03-apply
147+
spec:
148+
containers:
149+
- args:
150+
- --config-dir=clusters/build-clusters/build03
151+
- --as=
152+
- --kubeconfig=/etc/build-farm-credentials/kubeconfig
153+
- --confirm=true
154+
command:
155+
- applyconfig
156+
env:
157+
- name: build03_id
158+
valueFrom:
159+
secretKeyRef:
160+
key: build03-id
161+
name: build03-dex-oidc
162+
image: registry.ci.openshift.org/ci/applyconfig:latest
163+
imagePullPolicy: Always
164+
name: ""
165+
resources:
166+
requests:
167+
cpu: 10m
168+
volumeMounts:
169+
- mountPath: /etc/build-farm-credentials
170+
name: build-farm-credentials
171+
readOnly: true
172+
serviceAccountName: config-updater
173+
volumes:
174+
- name: build-farm-credentials
175+
secret:
176+
items:
177+
- key: sa.config-updater.build03.config
178+
path: kubeconfig
179+
secretName: config-updater
136180
- agent: kubernetes
137181
branches:
138182
- ^master$

‎ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,60 @@ presubmits:
464464
- emptyDir: {}
465465
name: tmp
466466
trigger: (?m)^/test( | .* )build02-dry,?($|\s.*)
467+
- agent: kubernetes
468+
always_run: false
469+
branches:
470+
- ^master$
471+
- ^master-
472+
cluster: app.ci
473+
context: ci/build-farm/build03-dry
474+
decorate: true
475+
labels:
476+
ci.openshift.io/build-farm: build03
477+
ci.openshift.io/generator: cluster-init
478+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
479+
name: pull-ci-openshift-release-master-build03-dry
480+
rerun_command: /test build03-dry
481+
run_if_changed: ^clusters/.*
482+
spec:
483+
containers:
484+
- args:
485+
- --config-dir=clusters/build-clusters/build03
486+
- --as=
487+
- --kubeconfig=/etc/build-farm-credentials/kubeconfig
488+
command:
489+
- applyconfig
490+
env:
491+
- name: HOME
492+
value: /tmp
493+
- name: build03_id
494+
valueFrom:
495+
secretKeyRef:
496+
key: build03-id
497+
name: build03-dex-oidc
498+
image: registry.ci.openshift.org/ci/applyconfig:latest
499+
imagePullPolicy: Always
500+
name: ""
501+
resources:
502+
requests:
503+
cpu: 10m
504+
volumeMounts:
505+
- mountPath: /etc/build-farm-credentials
506+
name: build-farm-credentials
507+
readOnly: true
508+
- mountPath: /tmp
509+
name: tmp
510+
serviceAccountName: config-updater
511+
volumes:
512+
- name: build-farm-credentials
513+
secret:
514+
items:
515+
- key: sa.config-updater.build03.config
516+
path: kubeconfig
517+
secretName: config-updater
518+
- emptyDir: {}
519+
name: tmp
520+
trigger: (?m)^/test( | .* )build03-dry,?($|\s.*)
467521
- agent: kubernetes
468522
always_run: false
469523
branches:

‎clusters/app.ci/dex/manifests.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ spec:
163163
redirectURIs:
164164
- https://oauth-openshift.apps.build10.ci.devcluster.openshift.com/oauth2callback/RedHat_Internal_SSO
165165
secretEnv: BUILD10-SECRET
166+
- idEnv: BUILD03-ID
167+
name: build03
168+
redirectURIs:
169+
- https://oauth-openshift.apps.build03.ci.devcluster.openshift.com/oauth2callback/RedHat_Internal_SSO
170+
secretEnv: BUILD03-SECRET
166171
storage:
167172
config:
168173
inCluster: true
@@ -390,6 +395,16 @@ spec:
390395
secretKeyRef:
391396
key: build10-secret
392397
name: build10-secret
398+
- name: BUILD03-ID
399+
valueFrom:
400+
secretKeyRef:
401+
key: build03-id
402+
name: build03-secret
403+
- name: BUILD03-SECRET
404+
valueFrom:
405+
secretKeyRef:
406+
key: build03-secret
407+
name: build03-secret
393408
image: ghcr.io/dexidp/dex:v2.31.0
394409
name: dex
395410
ports:

‎clusters/build-clusters/_cluster-init.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
managed:
22
- build01
33
- build02
4+
- build03
45
- build04
56
- build05
67
- build06
78
- build07
89
- build09
9-
- build11
1010
- build10
11+
- build11
1112
osd:
1213
- build04
1314
- build05

‎clusters/build-clusters/build03/assets/admin_cluster_oauth_template.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# !!! WARNING - DO NOT MODIFY !!!
2+
# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init
3+
# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories.
4+
# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/
5+
# or, alternatively, modifying the cluster-init tool itself.
6+
7+
apiVersion: template.openshift.io/v1
8+
kind: Template
9+
objects:
10+
- apiVersion: config.openshift.io/v1
11+
kind: OAuth
12+
metadata:
13+
name: cluster
14+
spec:
15+
identityProviders:
16+
- mappingMethod: claim
17+
name: RedHat_Internal_SSO
18+
openID:
19+
claims:
20+
email:
21+
- email
22+
name:
23+
- name
24+
preferredUsername:
25+
- preferred_username
26+
- email
27+
clientID: ${build03_id}
28+
clientSecret:
29+
name: dex-rh-sso
30+
extraScopes:
31+
- email
32+
- profile
33+
issuer: https://idp.ci.openshift.org
34+
type: OpenID
35+
tokenConfig:
36+
accessTokenMaxAgeSeconds: 2419200
37+
parameters:
38+
- description: build03_id
39+
name: build03_id
40+
required: true

‎clusters/build-clusters/build03/assets/quayio-pull-through-cache-icsp.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# !!! WARNING - DO NOT MODIFY !!!
2+
# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init
3+
# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories.
4+
# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/
5+
# or, alternatively, modifying the cluster-init tool itself.
6+
7+
apiVersion: operator.openshift.io/v1alpha1
8+
kind: ImageContentSourcePolicy
9+
metadata:
10+
name: quayio-pull-through-cache-icsp
11+
spec:
12+
repositoryDigestMirrors:
13+
- mirrors:
14+
- quayio-pull-through-cache-us-east-1-ci.apps.ci.l2s4.p1.openshiftapps.com
15+
source: quay.io

‎clusters/build-clusters/build03/cert-manager-operator/operator.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# !!! WARNING - DO NOT MODIFY !!!
2+
# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init
3+
# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories.
4+
# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/
5+
# or, alternatively, modifying the cluster-init tool itself.
6+
7+
apiVersion: v1
8+
kind: Namespace
9+
metadata:
10+
name: cert-manager-operator
11+
---
12+
apiVersion: operators.coreos.com/v1
13+
kind: OperatorGroup
14+
metadata:
15+
name: cert-manager-operator
16+
namespace: cert-manager-operator
17+
spec:
18+
targetNamespaces:
19+
- cert-manager-operator
20+
---
21+
apiVersion: operators.coreos.com/v1alpha1
22+
kind: Subscription
23+
metadata:
24+
labels:
25+
operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: ""
26+
name: openshift-cert-manager-operator
27+
namespace: cert-manager-operator
28+
spec:
29+
channel: stable-v1
30+
installPlanApproval: Automatic
31+
name: openshift-cert-manager-operator
32+
source: redhat-operators
33+
sourceNamespace: openshift-marketplace
34+
startingCSV: cert-manager-operator.v1.15.1
35+
---
36+
apiVersion: operator.openshift.io/v1alpha1
37+
kind: CertManager
38+
metadata:
39+
name: cluster
40+
spec:
41+
unsupportedConfigOverrides:
42+
controller:
43+
args:
44+
- --dns01-recursive-nameservers=8.8.8.8:53
45+
- --dns01-recursive-nameservers-only

‎clusters/build-clusters/build03/cert-manager/certificate.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# !!! WARNING - DO NOT MODIFY !!!
2+
# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init
3+
# Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories.
4+
# Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/
5+
# or, alternatively, modifying the cluster-init tool itself.
6+
7+
apiVersion: cert-manager.io/v1
8+
kind: Certificate
9+
metadata:
10+
labels:
11+
aws-project: openshift-ci-infra
12+
name: apiserver-tls
13+
namespace: openshift-config
14+
spec:
15+
dnsNames:
16+
- api.build03.ci.devcluster.openshift.com
17+
issuerRef:
18+
kind: ClusterIssuer
19+
name: cert-issuer-aws
20+
secretName: apiserver-tls
21+
---
22+
apiVersion: cert-manager.io/v1
23+
kind: Certificate
24+
metadata:
25+
labels:
26+
aws-project: openshift-ci-infra
27+
name: apps-tls
28+
namespace: openshift-ingress
29+
spec:
30+
dnsNames:
31+
- '*.apps.build03.ci.devcluster.openshift.com'
32+
issuerRef:
33+
kind: ClusterIssuer
34+
name: cert-issuer-aws
35+
secretName: apps-tls
36+
---
37+
apiVersion: cert-manager.io/v1
38+
kind: Certificate
39+
metadata:
40+
labels:
41+
gcp-project: openshift-ci-infra
42+
name: registry-tls
43+
namespace: openshift-image-registry
44+
spec:
45+
dnsNames:
46+
- registry.build03.ci.openshift.org
47+
issuerRef:
48+
kind: ClusterIssuer
49+
name: cert-issuer
50+
secretName: public-route-tls

0 commit comments

Comments
 (0)