Skip to content

Commit 40129b5

Browse files
committed
Add hub-spoke trust config, root CA monitoring, and kubeconfig guidance
Hub-spoke CA trust distribution via KlusterletConfig and CA ConfigMap. Root CA expiration monitoring via ACM Policy with PrometheusRule alerts. CertificatePolicy expanded to monitor cert-manager namespace. Kubeconfig trust documentation added to all profile READMEs. ACME remains the reference recommendation for ClusterIssuers. Other issuer types (e.g., CA issuer) are noted as allowable alternatives but no reference CRs are shipped for non-ACME issuers. Also includes: Konflux reference updates, observabilityRoutePolicy refactoring, MetalLB configuration state move to core-overlay, nftables firewall node disruption policy, container-mount-namespace netns race fix (OCPBUGS-83562), CPE version bump to 5.0, and Tekton pipeline 4.22->5.0 rename.
1 parent e8c0411 commit 40129b5

40 files changed

Lines changed: 633 additions & 97 deletions

File tree

.tekton/build-pipeline-telco-core-rds.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ spec:
161161
- name: name
162162
value: git-clone-oci-ta
163163
- name: bundle
164-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:13d49df7dc9ae301627e45f95a236011422996152f1bea46cd60217b0f057407
164+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
165165
- name: kind
166166
value: task
167167
resolver: bundles
@@ -209,7 +209,7 @@ spec:
209209
- name: name
210210
value: prefetch-dependencies-oci-ta
211211
- name: bundle
212-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:a2efbcdcecfa5293a622eb356a18f5c88e5714046b214fe8730b43b1a7dbb77d
212+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:3dc78afbf3a441e0280067433cb28ea3d2d0088ec214c73bf063f145b4f273ef
213213
- name: kind
214214
value: task
215215
resolver: bundles
@@ -302,7 +302,7 @@ spec:
302302
- name: name
303303
value: build-image-index
304304
- name: bundle
305-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:550afde50349e22ec11191ea0db9a49395ab46fef4e8317d820b6e946677ebeb
305+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
306306
- name: kind
307307
value: task
308308
resolver: bundles
@@ -392,7 +392,7 @@ spec:
392392
- name: name
393393
value: ecosystem-cert-preflight-checks
394394
- name: bundle
395-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:e2bcf1174a6dae9969b8f12e94babe2a5881bc77a509f10823b6a9eac6392850
395+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9c300728a03f41beee9a689422d66513d32ab5f804664fe561b11cebacd07799
396396
- name: kind
397397
value: task
398398
resolver: bundles
@@ -649,7 +649,7 @@ spec:
649649
- name: name
650650
value: rpms-signature-scan
651651
- name: bundle
652-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:cfdb76c67f27bc498132431f5a24fbc17dac1981d6f6e3da5cf5964ac5abdd20
652+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
653653
- name: kind
654654
value: task
655655
resolver: bundles

.tekton/build-pipeline-telco-hub-rds.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ spec:
154154
- name: name
155155
value: git-clone-oci-ta
156156
- name: bundle
157-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:13d49df7dc9ae301627e45f95a236011422996152f1bea46cd60217b0f057407
157+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
158158
- name: kind
159159
value: task
160160
resolver: bundles
@@ -202,7 +202,7 @@ spec:
202202
- name: name
203203
value: prefetch-dependencies-oci-ta
204204
- name: bundle
205-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:a2efbcdcecfa5293a622eb356a18f5c88e5714046b214fe8730b43b1a7dbb77d
205+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:3dc78afbf3a441e0280067433cb28ea3d2d0088ec214c73bf063f145b4f273ef
206206
- name: kind
207207
value: task
208208
resolver: bundles
@@ -291,7 +291,7 @@ spec:
291291
- name: name
292292
value: build-image-index
293293
- name: bundle
294-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:550afde50349e22ec11191ea0db9a49395ab46fef4e8317d820b6e946677ebeb
294+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
295295
- name: kind
296296
value: task
297297
resolver: bundles
@@ -381,7 +381,7 @@ spec:
381381
- name: name
382382
value: ecosystem-cert-preflight-checks
383383
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:e2bcf1174a6dae9969b8f12e94babe2a5881bc77a509f10823b6a9eac6392850
384+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9c300728a03f41beee9a689422d66513d32ab5f804664fe561b11cebacd07799
385385
- name: kind
386386
value: task
387387
resolver: bundles
@@ -638,7 +638,7 @@ spec:
638638
- name: name
639639
value: rpms-signature-scan
640640
- name: bundle
641-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:cfdb76c67f27bc498132431f5a24fbc17dac1981d6f6e3da5cf5964ac5abdd20
641+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
642642
- name: kind
643643
value: task
644644
resolver: bundles

.tekton/telco-core-rds-4-22-pull-request.yaml renamed to .tekton/telco-core-rds-5-0-pull-request.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ metadata:
1111
pipelinesascode.tekton.dev/on-cel-expression: |
1212
event == "pull_request" &&
1313
target_branch == "main" &&
14-
(".tekton/telco-core-rds-4-22-pull-request.yaml".pathChanged() ||
14+
(".tekton/telco-core-rds-5-0-pull-request.yaml".pathChanged() ||
1515
".tekton/build-pipeline-telco-core-rds.yaml".pathChanged() ||
1616
"telco-core/***".pathChanged())
1717
creationTimestamp: null
1818
labels:
19-
appstudio.openshift.io/application: telco-core-rds-4-22
20-
appstudio.openshift.io/component: telco-core-rds-4-22
19+
appstudio.openshift.io/application: telco-core-rds-5-0
20+
appstudio.openshift.io/component: telco-core-rds-5-0
2121
pipelines.appstudio.openshift.io/type: build
22-
name: telco-core-rds-4-22-on-pull-request
22+
name: telco-core-rds-5-0-on-pull-request
2323
namespace: telco-5g-tenant
2424
spec:
2525
params:
@@ -28,7 +28,7 @@ spec:
2828
- name: revision
2929
value: '{{revision}}'
3030
- name: output-image
31-
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-core-rds-4-22:on-pr-{{revision}}
31+
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-core-rds-5-0:on-pr-{{revision}}
3232
- name: image-expires-after
3333
value: 5d
3434
- name: build-platforms
@@ -49,7 +49,7 @@ spec:
4949
pipelineRef:
5050
name: build-pipeline-telco-core-rds
5151
taskRunTemplate:
52-
serviceAccountName: build-pipeline-telco-core-rds-4-22
52+
serviceAccountName: build-pipeline-telco-core-rds-5-0
5353
workspaces:
5454
- name: git-auth
5555
secret:
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ metadata:
1010
pipelinesascode.tekton.dev/on-cel-expression: |
1111
event == "push" &&
1212
target_branch == "main" &&
13-
(".tekton/telco-core-rds-4-22-push.yaml".pathChanged() ||
13+
(".tekton/telco-core-rds-5-0-push.yaml".pathChanged() ||
1414
".tekton/build-pipeline-telco-core-rds.yaml".pathChanged() ||
1515
"telco-core/***".pathChanged())
1616
creationTimestamp: null
1717
labels:
18-
appstudio.openshift.io/application: telco-core-rds-4-22
19-
appstudio.openshift.io/component: telco-core-rds-4-22
18+
appstudio.openshift.io/application: telco-core-rds-5-0
19+
appstudio.openshift.io/component: telco-core-rds-5-0
2020
pipelines.appstudio.openshift.io/type: build
21-
name: telco-core-rds-4-22-on-push
21+
name: telco-core-rds-5-0-on-push
2222
namespace: telco-5g-tenant
2323
spec:
2424
params:
@@ -27,7 +27,7 @@ spec:
2727
- name: revision
2828
value: '{{revision}}'
2929
- name: output-image
30-
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-core-rds-4-22:{{revision}}
30+
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-core-rds-5-0:{{revision}}
3131
- name: build-platforms
3232
value:
3333
- linux/x86_64
@@ -46,7 +46,7 @@ spec:
4646
pipelineRef:
4747
name: build-pipeline-telco-core-rds
4848
taskRunTemplate:
49-
serviceAccountName: build-pipeline-telco-core-rds-4-22
49+
serviceAccountName: build-pipeline-telco-core-rds-5-0
5050
workspaces:
5151
- name: git-auth
5252
secret:

.tekton/telco-hub-rds-4-22-pull-request.yaml renamed to .tekton/telco-hub-rds-5-0-pull-request.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ metadata:
1111
pipelinesascode.tekton.dev/on-cel-expression: |
1212
event == "pull_request" &&
1313
target_branch == "main" &&
14-
(".tekton/telco-hub-rds-4-22-pull-request.yaml".pathChanged() ||
14+
(".tekton/telco-hub-rds-5-0-pull-request.yaml".pathChanged() ||
1515
".tekton/build-pipeline-telco-hub-rds.yaml".pathChanged() ||
1616
"telco-hub/***".pathChanged())
1717
creationTimestamp: null
1818
labels:
19-
appstudio.openshift.io/application: telco-hub-rds-4-22
20-
appstudio.openshift.io/component: telco-hub-rds-4-22
19+
appstudio.openshift.io/application: telco-hub-rds-5-0
20+
appstudio.openshift.io/component: telco-hub-rds-5-0
2121
pipelines.appstudio.openshift.io/type: build
22-
name: telco-hub-rds-4-22-on-pull-request
22+
name: telco-hub-rds-5-0-on-pull-request
2323
namespace: telco-5g-tenant
2424
spec:
2525
params:
@@ -28,7 +28,7 @@ spec:
2828
- name: revision
2929
value: '{{revision}}'
3030
- name: output-image
31-
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-hub-rds-4-22:on-pr-{{revision}}
31+
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-hub-rds-5-0:on-pr-{{revision}}
3232
- name: image-expires-after
3333
value: 5d
3434
- name: build-platforms
@@ -49,7 +49,7 @@ spec:
4949
pipelineRef:
5050
name: build-pipeline-telco-hub-rds
5151
taskRunTemplate:
52-
serviceAccountName: build-pipeline-telco-hub-rds-4-22
52+
serviceAccountName: build-pipeline-telco-hub-rds-5-0
5353
workspaces:
5454
- name: git-auth
5555
secret:
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ metadata:
1010
pipelinesascode.tekton.dev/on-cel-expression: |
1111
event == "push" &&
1212
target_branch == "main" &&
13-
(".tekton/telco-hub-rds-4-22-push.yaml".pathChanged() ||
13+
(".tekton/telco-hub-rds-5-0-push.yaml".pathChanged() ||
1414
".tekton/build-pipeline-telco-hub-rds.yaml".pathChanged() ||
1515
"telco-hub/***".pathChanged())
1616
creationTimestamp: null
1717
labels:
18-
appstudio.openshift.io/application: telco-hub-rds-4-22
19-
appstudio.openshift.io/component: telco-hub-rds-4-22
18+
appstudio.openshift.io/application: telco-hub-rds-5-0
19+
appstudio.openshift.io/component: telco-hub-rds-5-0
2020
pipelines.appstudio.openshift.io/type: build
21-
name: telco-hub-rds-4-22-on-push
21+
name: telco-hub-rds-5-0-on-push
2222
namespace: telco-5g-tenant
2323
spec:
2424
params:
@@ -27,7 +27,7 @@ spec:
2727
- name: revision
2828
value: '{{revision}}'
2929
- name: output-image
30-
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-hub-rds-4-22:{{revision}}
30+
value: quay.io/redhat-user-workloads/telco-5g-tenant/telco-hub-rds-5-0:{{revision}}
3131
- name: build-platforms
3232
value:
3333
- linux/x86_64
@@ -46,7 +46,7 @@ spec:
4646
pipelineRef:
4747
name: build-pipeline-telco-hub-rds
4848
taskRunTemplate:
49-
serviceAccountName: build-pipeline-telco-hub-rds-4-22
49+
serviceAccountName: build-pipeline-telco-hub-rds-5-0
5050
workspaces:
5151
- name: git-auth
5252
secret:

telco-core/Dockerfile.telco-core

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CMD ["-c", "tar -cf - --directory /usr/share telco-core-rds | base64 -w0"]
1111

1212
LABEL com.redhat.component="openshift-telco-core-rds-container" \
1313
name="openshift4/openshift-telco-core-rds-rhel9" \
14-
cpe="cpe:/a:redhat:openshift:4.22::el9" \
14+
cpe="cpe:/a:redhat:openshift:5.0::el9" \
1515
summary="Telco Core RDS manifests" \
1616
io.openshift.expose-services="" \
1717
io.openshift.tags="" \

telco-core/configuration/core-baseline.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ policies:
7171
patches:
7272
- spec:
7373
installPlanApproval: Manual
74-
- path: reference-crs/required/networking/metallb/configurationstate.yaml
7574
- path: reference-crs/required/scheduling/NROPSubscriptionNS.yaml
7675
- path: reference-crs/required/scheduling/NROPSubscriptionOperGroup.yaml
7776
- path: reference-crs/required/scheduling/NROPSubscription.yaml
@@ -104,6 +103,9 @@ policies:
104103

105104
- path: reference-crs/required/networking/NMState.yaml
106105

106+
# Firewall node disruption policy
107+
- path: reference-crs/optional/networking/firewall/node-disruption-policy.yaml
108+
107109
# Scheduling
108110
- path: reference-crs/required/scheduling/sched.yaml
109111
patches:

telco-core/configuration/core-overlay.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ policies:
206206
nodeSelector:
207207
node-role.kubernetes.io/worker: ""
208208

209+
- path: reference-crs/required/networking/metallb/configurationstate.yaml
210+
209211
# - path: reference-crs/required/networking/metallb/bfd-profile.yaml
210212
# - path: reference-crs/required/networking/metallb/addr-pool.yaml
211213
# patches:

telco-core/configuration/reference-crs-kube-compare/metadata.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ parts:
9494
- path: optional/networking/multus/tap_cni/mc_rootless_pods_selinux.yaml
9595
- path: required/networking/metallb/community.yaml
9696
- path: optional/networking/nodeNetworkConfigurationPolicy.yaml
97+
- name: networking-firewall
98+
anyOf:
99+
- path: optional/networking/firewall/node-disruption-policy.yaml
100+
config:
101+
ignore-unspecified-fields: true
97102
- name: required-other
98103
components:
99104
- name: disconnected-registry
@@ -224,6 +229,7 @@ templateFunctionFiles:
224229
- version_match.tmpl
225230
- unordered_list.tmpl
226231
- validate_base64_list.tmpl
232+
- required-object-list.tmpl
227233

228234
fieldsToOmit:
229235
defaultOmitRef: all

0 commit comments

Comments
 (0)