Skip to content

Commit 0bddac8

Browse files
authored
Merge branch 'main' into update-osp-dev-stage
2 parents b99d5e4 + e885830 commit 0bddac8

File tree

11 files changed

+53
-22
lines changed

11 files changed

+53
-22
lines changed

components/authentication/base/konflux-admins.yaml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
kind: ClusterRole
21
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
33
metadata:
44
name: konflux-admins
55
rules:
@@ -325,8 +325,13 @@ rules:
325325
resources:
326326
- customresourcedefinitions
327327
verbs:
328-
- list
328+
- create
329329
- get
330+
- list
331+
- watch
332+
- patch
333+
- update
334+
- delete
330335
- apiGroups:
331336
- kyverno.io
332337
resources:
@@ -354,11 +359,11 @@ rules:
354359
verbs:
355360
- '*'
356361
- apiGroups:
357-
- kueue.x-k8s.io
362+
- kueue.x-k8s.io
358363
resources:
359-
- '*'
364+
- '*'
360365
verbs:
361-
- '*'
366+
- '*'
362367
- apiGroups:
363368
- flowcontrol.apiserver.k8s.io
364369
resources:
@@ -368,6 +373,24 @@ rules:
368373
- get
369374
- list
370375
- watch
376+
- apiGroups:
377+
- project.openshift.io
378+
resources:
379+
- '*'
380+
verbs:
381+
- '*'
382+
- apiGroups:
383+
- admissionregistration.k8s.io
384+
resources:
385+
- validatingwebhookconfigurations
386+
verbs:
387+
- create
388+
- get
389+
- list
390+
- watch
391+
- patch
392+
- update
393+
- delete
371394
---
372395
apiVersion: rbac.authorization.k8s.io/v1
373396
kind: ClusterRoleBinding

components/kubearchive/production/kflux-ocp-p01/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
resources:
55
- ../../base
66
- ../base
7-
- https://github.com/kubearchive/kubearchive/releases/download/v1.2.0/kubearchive.yaml?timeout=90
7+
- https://github.com/kubearchive/kubearchive/releases/download/v1.5.0/kubearchive.yaml?timeout=90
88

99
namespace: product-kubearchive
1010

@@ -21,7 +21,7 @@ patches:
2121
- name: migration
2222
env:
2323
- name: KUBEARCHIVE_VERSION
24-
value: v1.2.0
24+
value: v1.5.0
2525
# We don't need the Secret as it will be created by the ExternalSecrets Operator
2626
- patch: |-
2727
$patch: delete

components/kubearchive/production/kflux-prd-rh03/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
resources:
55
- ../../base
66
- ../base
7-
- https://github.com/kubearchive/kubearchive/releases/download/v1.2.0/kubearchive.yaml?timeout=90
7+
- https://github.com/kubearchive/kubearchive/releases/download/v1.5.0/kubearchive.yaml?timeout=90
88

99
namespace: product-kubearchive
1010

@@ -21,7 +21,7 @@ patches:
2121
- name: migration
2222
env:
2323
- name: KUBEARCHIVE_VERSION
24-
value: v1.2.0
24+
value: v1.5.0
2525
# We don't need the Secret as it will be created by the ExternalSecrets Operator
2626
- patch: |-
2727
$patch: delete

components/kubearchive/production/kflux-rhel-p01/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
resources:
55
- ../../base
66
- ../base
7-
- https://github.com/kubearchive/kubearchive/releases/download/v1.3.0/kubearchive.yaml?timeout=90
7+
- https://github.com/kubearchive/kubearchive/releases/download/v1.5.0/kubearchive.yaml?timeout=90
88

99
namespace: product-kubearchive
1010

@@ -21,7 +21,7 @@ patches:
2121
- name: migration
2222
env:
2323
- name: KUBEARCHIVE_VERSION
24-
value: v1.3.0
24+
value: v1.5.0
2525
# We don't need the Secret as it will be created by the ExternalSecrets Operator
2626
- patch: |-
2727
$patch: delete

components/kubearchive/production/stone-prod-p02/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Kustomization
44
resources:
55
- ../../base
66
- ../base
7-
- https://github.com/kubearchive/kubearchive/releases/download/v1.3.0/kubearchive.yaml?timeout=90
7+
- https://github.com/kubearchive/kubearchive/releases/download/v1.5.0/kubearchive.yaml?timeout=90
88

99
namespace: product-kubearchive
1010

@@ -21,7 +21,7 @@ patches:
2121
- name: migration
2222
env:
2323
- name: KUBEARCHIVE_VERSION
24-
value: v1.3.0
24+
value: v1.5.0
2525
# We don't need the Secret as it will be created by the ExternalSecrets Operator
2626
- patch: |-
2727
$patch: delete

components/mintmaker/development/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../base
5-
- https://github.com/konflux-ci/mintmaker/config/default?ref=5f632ab7a9aabdff16092cc05127995c37c81d94
6-
- https://github.com/konflux-ci/mintmaker/config/renovate?ref=5f632ab7a9aabdff16092cc05127995c37c81d94
5+
- https://github.com/konflux-ci/mintmaker/config/default?ref=94c684759d5f3fae276d0b1079640065d6856486
6+
- https://github.com/konflux-ci/mintmaker/config/renovate?ref=94c684759d5f3fae276d0b1079640065d6856486
77

88
images:
99
- name: quay.io/konflux-ci/mintmaker
1010
newName: quay.io/konflux-ci/mintmaker
11-
newTag: 5f632ab7a9aabdff16092cc05127995c37c81d94
11+
newTag: 94c684759d5f3fae276d0b1079640065d6856486
1212

1313
namespace: mintmaker
1414

components/mintmaker/staging/base/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Kustomization
33
resources:
44
- ../../base
55
- ../../base/external-secrets
6-
- https://github.com/konflux-ci/mintmaker/config/default?ref=5f632ab7a9aabdff16092cc05127995c37c81d94
7-
- https://github.com/konflux-ci/mintmaker/config/renovate?ref=5f632ab7a9aabdff16092cc05127995c37c81d94
6+
- https://github.com/konflux-ci/mintmaker/config/default?ref=94c684759d5f3fae276d0b1079640065d6856486
7+
- https://github.com/konflux-ci/mintmaker/config/renovate?ref=94c684759d5f3fae276d0b1079640065d6856486
88

99
namespace: mintmaker
1010

1111
images:
1212
- name: quay.io/konflux-ci/mintmaker
1313
newName: quay.io/konflux-ci/mintmaker
14-
newTag: 5f632ab7a9aabdff16092cc05127995c37c81d94
14+
newTag: 94c684759d5f3fae276d0b1079640065d6856486
1515
- name: quay.io/konflux-ci/mintmaker-renovate-image
1616
newName: quay.io/konflux-ci/mintmaker-renovate-image
1717
newTag: eebfc799ae059998dfbc1588ed44cc81a920a8ad

components/mintmaker/staging/base/manager_patch.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@ spec:
88
spec:
99
containers:
1010
- name: manager
11+
args:
12+
- --metrics-bind-address=:8080
13+
- --health-probe-bind-address=:8081
14+
- --metrics-secure=false
15+
- --pprof-bind-address=:6060
1116
resources:
1217
limits:
1318
cpu: 500m
1419
memory: 2048Mi
1520
requests:
1621
cpu: 100m
1722
memory: 256Mi
23+
env:
24+
- name: ENABLE_PROFILING
25+
value: "true"

components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@ spec:
20022002
deployments:
20032003
pipelines-as-code-watcher:
20042004
spec:
2005-
replicas: 1
2005+
replicas: 2
20062006
pipelines-as-code-webhook:
20072007
spec:
20082008
replicas: 2

components/pipeline-service/staging/stone-stage-p01/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,7 @@ spec:
25852585
deployments:
25862586
pipelines-as-code-watcher:
25872587
spec:
2588-
replicas: 1
2588+
replicas: 2
25892589
pipelines-as-code-webhook:
25902590
spec:
25912591
replicas: 2

0 commit comments

Comments
 (0)