Skip to content

Commit 4928502

Browse files
committed
Move SELinux jobs to RHEL9
1 parent 08ab209 commit 4928502

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ def generate_misc():
903903
build_test(name_override="kops-aws-selinux",
904904
# RHEL8 VM image is enforcing SELinux by default.
905905
cloud="aws",
906-
distro="rhel8",
906+
distro="rhel9",
907907
networking="cilium",
908908
k8s_version="ci",
909909
kops_channel="alpha",
@@ -940,7 +940,7 @@ def generate_misc():
940940
build_test(name_override="kops-aws-selinux-alpha",
941941
# RHEL8 VM image is enforcing SELinux by default.
942942
cloud="aws",
943-
distro="rhel8",
943+
distro="rhel9",
944944
networking="cilium",
945945
k8s_version="ci",
946946
kops_channel="alpha",

config/jobs/kubernetes/kops/kops-periodics-misc2.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ periodics:
20792079
testgrid-days-of-results: '90'
20802080
testgrid-tab-name: kops-aws-hostname-bug121018
20812081

2082-
# {"cloud": "aws", "distro": "rhel8", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery", "feature_flags": "SELinuxMount", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
2082+
# {"cloud": "aws", "distro": "rhel9", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery", "feature_flags": "SELinuxMount", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
20832083
- name: e2e-kops-aws-selinux
20842084
cron: '38 1-23/8 * * *'
20852085
labels:
@@ -2109,7 +2109,7 @@ periodics:
21092109
-v 2 \
21102110
--up --down \
21112111
--cloud-provider=aws \
2112-
--create-args="--image='309956199498/RHEL-8.9.0_HVM-20240327-x86_64-4-Hourly2-GP3' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery" \
2112+
--create-args="--image='309956199498/RHEL-9.6.0_HVM-20250618-x86_64-0-Hourly2-GP3' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery" \
21132113
--env=KOPS_FEATURE_FLAGS=SELinuxMount \
21142114
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
21152115
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
@@ -2138,18 +2138,18 @@ periodics:
21382138
memory: 6Gi
21392139
annotations:
21402140
test.kops.k8s.io/cloud: aws
2141-
test.kops.k8s.io/distro: rhel8
2141+
test.kops.k8s.io/distro: rhel9
21422142
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery
21432143
test.kops.k8s.io/feature_flags: SELinuxMount
21442144
test.kops.k8s.io/k8s_version: ci
21452145
test.kops.k8s.io/kops_channel: alpha
21462146
test.kops.k8s.io/kops_version: latest
21472147
test.kops.k8s.io/networking: cilium
2148-
testgrid-dashboards: kops-distro-rhel8, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
2148+
testgrid-dashboards: kops-distro-rhel9, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
21492149
testgrid-days-of-results: '90'
21502150
testgrid-tab-name: kops-aws-selinux
21512151

2152-
# {"cloud": "aws", "distro": "rhel8", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery", "feature_flags": "SELinuxMount", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
2152+
# {"cloud": "aws", "distro": "rhel9", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery", "feature_flags": "SELinuxMount", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
21532153
- name: e2e-kops-aws-selinux-alpha
21542154
cron: '8 0-23/8 * * *'
21552155
labels:
@@ -2179,7 +2179,7 @@ periodics:
21792179
-v 2 \
21802180
--up --down \
21812181
--cloud-provider=aws \
2182-
--create-args="--image='309956199498/RHEL-8.9.0_HVM-20240327-x86_64-4-Hourly2-GP3' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery" \
2182+
--create-args="--image='309956199498/RHEL-9.6.0_HVM-20250618-x86_64-0-Hourly2-GP3' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery" \
21832183
--env=KOPS_FEATURE_FLAGS=SELinuxMount \
21842184
--kubernetes-feature-gates=SELinuxMount,SELinuxChangePolicy \
21852185
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
@@ -2209,14 +2209,14 @@ periodics:
22092209
memory: 6Gi
22102210
annotations:
22112211
test.kops.k8s.io/cloud: aws
2212-
test.kops.k8s.io/distro: rhel8
2212+
test.kops.k8s.io/distro: rhel9
22132213
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery
22142214
test.kops.k8s.io/feature_flags: SELinuxMount
22152215
test.kops.k8s.io/k8s_version: ci
22162216
test.kops.k8s.io/kops_channel: alpha
22172217
test.kops.k8s.io/kops_version: latest
22182218
test.kops.k8s.io/networking: cilium
2219-
testgrid-dashboards: kops-distro-rhel8, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
2219+
testgrid-dashboards: kops-distro-rhel9, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
22202220
testgrid-days-of-results: '90'
22212221
testgrid-tab-name: kops-aws-selinux-alpha
22222222

0 commit comments

Comments
 (0)