Skip to content

Commit 64bbd43

Browse files
authored
Remove k8s-1.33 subjects (now EOL) (#1234)
This branch is EOL. Operators may continue to offer it according to the standard. However, this branch cannot pass the version test, so remove it from the compliance monitor. Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>
1 parent 9089588 commit 64bbd43

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

Tests/config.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,10 @@ scopes = [
4040
"scs-compatible-kaas",
4141
]
4242
subjects = [
43-
"noris-1.33",
4443
"noris-1.34",
4544
"noris-1.35",
46-
"scaleup-1.33",
4745
"scaleup-1.34",
4846
"scaleup-1.35",
49-
"syself-1.33",
5047
"syself-1.34",
5148
"syself-1.35",
5249
]
@@ -58,9 +55,7 @@ scopes = [
5855
"scs-compatible-kaas",
5956
]
6057
subjects = [
61-
"noris-1.33",
62-
"scaleup-1.33",
63-
"syself-1.33",
58+
# add 1.36 subjects here
6459
]
6560
workers = 4
6661

Tests/kaas/scs_0210_version_policy/k8s-eol-data.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# https://kubernetes.io/releases/patch-releases/#detailed-release-history-for-active-branches
22

3+
- branch: '1.36'
4+
end-of-life: '2027-06-28'
35
- branch: '1.35'
46
end-of-life: '2027-02-28'
57
- branch: '1.34'

compliance-monitor/bootstrap.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ accounts:
9393
public_key_type: "ssh-ed25519"
9494
public_key_name: "primary"
9595
- subject: noris-1.33
96-
group: noris
96+
group: noris-eol
9797
delegates:
9898
- zuul_ci
9999
- subject: noris-1.34
@@ -105,7 +105,7 @@ accounts:
105105
delegates:
106106
- zuul_ci
107107
- subject: scaleup-1.33
108-
group: scaleup
108+
group: scaleup-eol
109109
delegates:
110110
- zuul_ci
111111
- subject: scaleup-1.34
@@ -117,7 +117,7 @@ accounts:
117117
delegates:
118118
- zuul_ci
119119
- subject: syself-1.33
120-
group: syself
120+
group: syself-eol
121121
delegates:
122122
- zuul_ci
123123
- subject: syself-1.34

0 commit comments

Comments
 (0)