Skip to content

Commit 47f9dc4

Browse files
authored
Add manifests for rh03 (#6081)
Signed-off-by: Gal Ben Haim <[email protected]>
1 parent c727222 commit 47f9dc4

File tree

59 files changed

+4456
-2
lines changed

Some content is hidden

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

59 files changed

+4456
-2
lines changed

argo-cd-apps/base/all-clusters/infra-deployments/monitoring-workload-logging/monitoring-workload-logging.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ spec:
2929
values.clusterDir: stone-prod-p02
3030
- nameNormalized: kflux-prd-rh02
3131
values.clusterDir: kflux-prd-rh02
32+
- nameNormalized: kflux-prd-rh03
33+
values.clusterDir: kflux-prd-rh03
3234
template:
3335
metadata:
3436
name: monitoring-workload-logging-{{nameNormalized}}

argo-cd-apps/base/all-clusters/infra-deployments/monitoring-workload-prometheus/monitoring-workload-prometheus.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ spec:
3535
values.clusterDir: stone-prod-p02
3636
- nameNormalized: kflux-prd-rh02
3737
values.clusterDir: kflux-prd-rh02
38+
- nameNormalized: kflux-prd-rh03
39+
values.clusterDir: kflux-prd-rh03
3840
template:
3941
metadata:
4042
name: monitoring-workload-prometheus-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/build-service/build-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
values.clusterDir: stone-prod-p02
2626
- nameNormalized: kflux-prd-rh02
2727
values.clusterDir: kflux-prd-rh02
28+
- nameNormalized: kflux-prd-rh03
29+
values.clusterDir: kflux-prd-rh03
2830
template:
2931
metadata:
3032
name: build-service-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/integration/integration.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
values.clusterDir: stone-prod-p02
2626
- nameNormalized: kflux-prd-rh02
2727
values.clusterDir: kflux-prd-rh02
28+
- nameNormalized: kflux-prd-rh03
29+
values.clusterDir: kflux-prd-rh03
2830
template:
2931
metadata:
3032
name: integration-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/konflux-info/konflux-info.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ spec:
3232
values.clusterDir: stone-prod-p02
3333
- nameNormalized: kflux-prd-rh02
3434
values.clusterDir: kflux-prd-rh02
35+
- nameNormalized: kflux-prd-rh03
36+
values.clusterDir: kflux-prd-rh03
3537
template:
3638
metadata:
3739
name: konflux-info-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/konflux-rbac/konflux-rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ spec:
3131
values.clusterDir: stone-prod-p02
3232
- nameNormalized: kflux-prd-rh02
3333
values.clusterDir: kflux-prd-rh02
34+
- nameNormalized: kflux-prd-rh03
35+
values.clusterDir: kflux-prd-rh03
3436
template:
3537
metadata:
3638
name: konflux-rbac-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/konflux-ui/konflux-ui.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ spec:
3232
values.clusterDir: stone-prod-p02
3333
- nameNormalized: kflux-ocp-p01
3434
values.clusterDir: kflux-ocp-p01
35+
- nameNormalized: kflux-prd-rh03
36+
values.clusterDir: kflux-prd-rh03
3537
template:
3638
metadata:
3739
name: konflux-ui-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/kyverno/kyverno.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ spec:
2929
values.clusterDir: stone-prod-p02
3030
- nameNormalized: kflux-ocp-p01
3131
values.clusterDir: kflux-ocp-p01
32+
- nameNormalized: kflux-prd-rh03
33+
values.clusterDir: kflux-prd-rh03
3234
template:
3335
metadata:
3436
name: kyverno-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/mintmaker/mintmaker.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
values.clusterDir: stone-prod-p02
2626
- nameNormalized: kflux-prd-rh02
2727
values.clusterDir: kflux-prd-rh02
28+
- nameNormalized: kflux-prd-rh03
29+
values.clusterDir: kflux-prd-rh03
2830
template:
2931
metadata:
3032
name: mintmaker-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/multi-platform-controller/multi-platform-controller.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
values.clusterDir: stone-prd-rh01
2626
- nameNormalized: kflux-prd-rh02
2727
values.clusterDir: kflux-prd-rh02
28+
- nameNormalized: kflux-prd-rh03
29+
values.clusterDir: kflux-prd-rh03
2830
template:
2931
metadata:
3032
name: multi-platform-controller-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/namespace-lister/namespace-lister.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
values.clusterDir: stone-prod-p02
3434
- nameNormalized: kflux-ocp-p01
3535
values.clusterDir: kflux-ocp-p01
36+
- nameNormalized: kflux-prd-rh03
37+
values.clusterDir: kflux-prd-rh03
3638
template:
3739
metadata:
3840
name: namespace-lister-{{nameNormalized}}

argo-cd-apps/base/member/infra-deployments/pipeline-service/pipeline-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ spec:
3131
values.clusterDir: stone-prod-p02
3232
- nameNormalized: kflux-prd-rh02
3333
values.clusterDir: kflux-prd-rh02
34+
- nameNormalized: kflux-prd-rh03
35+
values.clusterDir: kflux-prd-rh03
3436
template:
3537
metadata:
3638
name: pipeline-service-{{nameNormalized}}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- op: replace
2+
path: /spec/dataFrom/0/extract/key
3+
value: production/platform/terraform/generated/kflux-prd-rh03/backup-bucket
4+
- op: replace
5+
path: /spec/secretStoreRef/name
6+
value: appsre-stonesoup-vault
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apiVersion: velero.io/v1
2+
kind: Schedule
3+
metadata:
4+
name: backup-tenants
5+
annotations:
6+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7+
spec:
8+
schedule: 30 1,13 * * * # every day 1:30, 13:30 UTC
9+
template:
10+
excludedNamespaces:
11+
- kube-*
12+
- openshift*
13+
- appstudio*
14+
- admin-checker
15+
- application-api
16+
- application-service
17+
- appsre-vault
18+
- build-service
19+
- build-templates
20+
- build-templates-e2e
21+
- ci-helper-app
22+
- dedicated-admin
23+
- deployment-validation-operator
24+
- dora-metrics
25+
- enterprise-contract-service
26+
- external-secrets-operator
27+
- group-sync-operator
28+
- hac-pact-broker
29+
- image-controller
30+
- integration-service
31+
- internal-services
32+
- jvm-build-service
33+
- multi-platform-controller
34+
- perf-team-prometheus-reader
35+
- plnsvc-tests
36+
- quality-dashboard
37+
- release-service
38+
- sandbox-sre-member
39+
- tekton-results
40+
- toolchain-member-operator
41+
includedResources:
42+
- applications.appstudio.redhat.com
43+
- components.appstudio.redhat.com
44+
- environments.appstudio.redhat.com
45+
- integrationtestscenarios.appstudio.redhat.com
46+
- secrets
47+
- snapshots.appstudio.redhat.com
48+
- serviceaccounts
49+
- namespaces
50+
storageLocation: velero-aws-1
51+
ttl: 720h0m0s
52+
useOwnerReferencesInBackup: true
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: replace
2+
path: /spec/backupLocations/0/velero/objectStorage/bucket
3+
value: backup-kflux-prd-rh03
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- op: remove
2+
path: /spec/backupLocations/0/velero/config/kmsKeyId
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ../../base/all-clusters
5+
- backup-tenants-schedule.yaml
6+
patches:
7+
- target:
8+
group: external-secrets.io
9+
version: v1beta1
10+
kind: ExternalSecret
11+
name: backup-s3-credentials
12+
path: backup-s3-credentials-patch.yaml
13+
- target:
14+
group: oadp.openshift.io
15+
version: v1alpha1
16+
kind: DataProtectionApplication
17+
name: velero-aws
18+
path: dpa-bucket-patch.yaml
19+
- target:
20+
group: oadp.openshift.io
21+
version: v1alpha1
22+
kind: DataProtectionApplication
23+
name: velero-aws
24+
path: dpa-kmskeyid-patch.yaml
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ../base
5+
namespace: build-service
6+
patches:
7+
- path: pipelines-as-code-secret-path.yaml
8+
target:
9+
name: pipelines-as-code-secret
10+
group: external-secrets.io
11+
version: v1beta1
12+
kind: ExternalSecret
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
- op: add
3+
path: /spec/dataFrom/0/extract/key
4+
value: production/pipeline-service/kflux-prd-rh03/github-app

components/cluster-secret-store/base/appsre-stonesoup-vault-secret-store.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,8 @@ spec:
6262
- rhtap-release-2-tenant
6363
- rhtap-releng-tenant
6464
- costmanagement-metrics-operator
65-
66-
65+
- openshift-adp
66+
- tekton-logging
67+
- tekton-results
68+
- openshift-adp
69+
- product-kubearchive
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[
2+
{
3+
"op": "replace",
4+
"path": "/data/CONSOLE_URL",
5+
"value": "https://konflux-ui.apps.kflux-prd-rh03.nnv1.p1.openshiftapps.com/ns/{{ .Namespace }}/pipelinerun/{{ .PipelineRunName }}"
6+
},
7+
{
8+
"op": "replace",
9+
"path": "/data/CONSOLE_URL_TASKLOG",
10+
"value": "https://konflux-ui.apps.kflux-prd-rh03.nnv1.p1.openshiftapps.com/ns/{{ .Namespace }}/pipelinerun/{{ .PipelineRunName }}/logs/{{ .TaskName }}"
11+
}
12+
]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ../base
5+
patches:
6+
- path: pipelines-as-code-secret-path.yaml
7+
target:
8+
name: pipelines-as-code-secret
9+
group: external-secrets.io
10+
version: v1beta1
11+
kind: ExternalSecret
12+
- path: console-url-config-patch.json
13+
target:
14+
kind: ConfigMap
15+
name: integration-config
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
- op: add
3+
path: /spec/dataFrom/0/extract/key
4+
value: production/pipeline-service/kflux-prd-rh03/github-app
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"environment": "production",
3+
"integrations": {
4+
"github": {
5+
"application_url": "https://github.com/apps/red-hat-konflux-kflux-prd-rh03"
6+
},
7+
"sbom_server": {
8+
"url": "https://atlas.devshift.net/sbom/content/<PLACEHOLDER>"
9+
},
10+
"image_controller": {
11+
"enabled": true,
12+
"notifications": [
13+
{
14+
"title": "SBOM-event-to-Bombino",
15+
"event": "repo_push",
16+
"method": "webhook",
17+
"config": {
18+
"url": "https://bombino.api.redhat.com/v1/sbom/quay/push"
19+
}
20+
}
21+
]
22+
}
23+
},
24+
"rbac": [
25+
{
26+
"displayName": "admin",
27+
"description": "Full access to Konflux resources including secrets",
28+
"roleRef": {
29+
"apiGroup": "rbac.authorization.k8s.io",
30+
"kind": "ClusterRole",
31+
"name": "konflux-admin-user-actions"
32+
}
33+
},
34+
{
35+
"displayName": "maintainer",
36+
"description": "Partial access to Konflux resources without access to secrets",
37+
"roleRef": {
38+
"apiGroup": "rbac.authorization.k8s.io",
39+
"kind": "ClusterRole",
40+
"name": "konflux-maintainer-user-actions"
41+
}
42+
},
43+
{
44+
"displayName": "contributor",
45+
"description": "View access to Konflux resources without access to secrets",
46+
"roleRef": {
47+
"apiGroup": "rbac.authorization.k8s.io",
48+
"kind": "ClusterRole",
49+
"name": "konflux-contributor-user-actions"
50+
}
51+
}
52+
]
53+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ../../base
5+
6+
generatorOptions:
7+
disableNameSuffixHash: true
8+
9+
configMapGenerator:
10+
- name: konflux-public-info
11+
files:
12+
- info.json
13+
14+
namespace: konflux-info
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kind: Kustomization
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
resources:
4+
- ../base
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
- op: add
3+
path: /metadata/annotations/service.beta.openshift.io~1serving-cert-secret-name
4+
value: serving-cert

0 commit comments

Comments
 (0)