Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Katka92 committed Dec 3, 2024
2 parents 08b0241 + d826100 commit a19ab17
Show file tree
Hide file tree
Showing 22 changed files with 2,483 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,9 @@ kind: ApplicationSet
metadata:
name: konflux-ui
$patch: delete
---
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: nvme-storage-configurator
$patch: delete
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,9 @@ kind: ApplicationSet
metadata:
name: konflux-ui
$patch: delete
---
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: nvme-storage-configurator
$patch: delete
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
namespace: build-service
patches:
- path: pipelines-as-code-secret-path.yaml
target:
name: pipelines-as-code-secret
group: external-secrets.io
version: v1beta1
kind: ExternalSecret
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- op: add
path: /spec/dataFrom/0/extract/key
value: production/pipeline-service/kflux-prd-rh02/github-app
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"op": "replace",
"path": "/data/CONSOLE_URL",
"value": "https://TBA/ns/{{ .Namespace }}/pipelinerun/{{ .PipelineRunName }}"
},
{
"op": "replace",
"path": "/data/CONSOLE_URL_TASKLOG",
"value": "TBA/ns/{{ .Namespace }}/pipelinerun/{{ .PipelineRunName }}/logs/{{ .TaskName }}"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: pipelines-as-code-secret-path.yaml
target:
name: pipelines-as-code-secret
group: external-secrets.io
version: v1beta1
kind: ExternalSecret
- path: console-url-config-patch.json
target:
kind: ConfigMap
name: integration-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- op: add
path: /spec/dataFrom/0/extract/key
value: production/pipeline-service/kflux-prd-rh02/github-app
12 changes: 12 additions & 0 deletions components/mintmaker/production/kflux-prd-rh02/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
namespace: mintmaker
patches:
- path: pipelines-as-code-secret-path.yaml
target:
name: pipelines-as-code-secret
group: external-secrets.io
version: v1beta1
kind: ExternalSecret
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- op: add
path: /spec/dataFrom/0/extract/key
value: production/pipeline-service/kflux-prd-rh02/github-app
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
- ../../base/logging-operator-prerequisite
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- op: add
path: /spec/prometheusConfig/externalLabels/source_cluster
value: kflux-prd-rh02
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base

patches:
- path: cluster-id-label.yaml
target:
name: appstudio-federate-ms
kind: MonitoringStack
group: monitoring.rhobs
version: v1alpha1
Loading

0 comments on commit a19ab17

Please sign in to comment.