Skip to content

Commit 12d9e3d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35305 from jsafrane/downgrade-selinux-rhel
Downgrade RHEL in SELinux jobs
2 parents 2e1b980 + ce464b4 commit 12d9e3d

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

‎config/jobs/kubernetes/kops/build_jobs.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,13 +917,16 @@ def generate_misc():
917917
build_test(name_override="kops-aws-selinux",
918918
# RHEL8 VM image is enforcing SELinux by default.
919919
cloud="aws",
920-
distro="rhel9",
920+
distro="rhel8",
921921
networking="cilium",
922922
k8s_version="ci",
923923
kops_channel="alpha",
924924
feature_flags=['SELinuxMount'],
925925
extra_flags=[
926926
"--set=cluster.spec.containerd.selinuxEnabled=true",
927+
# Use older containerd that still works on RHEL8
928+
"--set=cluster.spec.containerd.version=1.7.28",
929+
"--set=cluster.spec.containerd.runc.version=1.3.0",
927930
# Run all default controllers ("*") + selinux-warning-controller.
928931
"--set=cluster.spec.kubeControllerManager.controllers=*",
929932
"--set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller"
@@ -956,14 +959,17 @@ def generate_misc():
956959
build_test(name_override="kops-aws-selinux-alpha",
957960
# RHEL8 VM image is enforcing SELinux by default.
958961
cloud="aws",
959-
distro="rhel9",
962+
distro="rhel8",
960963
networking="cilium",
961964
k8s_version="ci",
962965
kops_channel="alpha",
963966
feature_flags=['SELinuxMount'],
964967
kubernetes_feature_gates="SELinuxMount,SELinuxChangePolicy",
965968
extra_flags=[
966969
"--set=cluster.spec.containerd.selinuxEnabled=true",
970+
# Use older containerd that still works on RHEL8
971+
"--set=cluster.spec.containerd.version=1.7.28",
972+
"--set=cluster.spec.containerd.runc.version=1.3.0",
967973
# Run all default controllers ("*") + selinux-warning-controller.
968974
"--set=cluster.spec.kubeControllerManager.controllers=*",
969975
"--set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller"

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

Lines changed: 10 additions & 10 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": "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"}
2082+
# {"cloud": "aws", "distro": "rhel8", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --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-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" \
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.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --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,20 +2138,20 @@ periodics:
21382138
memory: 6Gi
21392139
annotations:
21402140
test.kops.k8s.io/cloud: aws
2141-
test.kops.k8s.io/distro: rhel9
2142-
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
2141+
test.kops.k8s.io/distro: rhel8
2142+
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --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
21482148
testgrid-alert-email: [email protected]
2149-
testgrid-dashboards: kops-distro-rhel9, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
2149+
testgrid-dashboards: kops-distro-rhel8, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
21502150
testgrid-days-of-results: '90'
21512151
testgrid-num-failures-to-alert: '10'
21522152
testgrid-tab-name: kops-aws-selinux
21532153

2154-
# {"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"}
2154+
# {"cloud": "aws", "distro": "rhel8", "extra_flags": "--set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --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"}
21552155
- name: e2e-kops-aws-selinux-alpha
21562156
cron: '8 0-23/8 * * *'
21572157
labels:
@@ -2181,7 +2181,7 @@ periodics:
21812181
-v 2 \
21822182
--up --down \
21832183
--cloud-provider=aws \
2184-
--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" \
2184+
--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.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery" \
21852185
--env=KOPS_FEATURE_FLAGS=SELinuxMount \
21862186
--kubernetes-feature-gates=SELinuxMount,SELinuxChangePolicy \
21872187
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
@@ -2211,15 +2211,15 @@ periodics:
22112211
memory: 6Gi
22122212
annotations:
22132213
test.kops.k8s.io/cloud: aws
2214-
test.kops.k8s.io/distro: rhel9
2215-
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
2214+
test.kops.k8s.io/distro: rhel8
2215+
test.kops.k8s.io/extra_flags: --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --set=cluster.spec.kubeControllerManager.controllers=* --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --discovery-store=s3://k8s-kops-prow/discovery
22162216
test.kops.k8s.io/feature_flags: SELinuxMount
22172217
test.kops.k8s.io/k8s_version: ci
22182218
test.kops.k8s.io/kops_channel: alpha
22192219
test.kops.k8s.io/kops_version: latest
22202220
test.kops.k8s.io/networking: cilium
22212221
testgrid-alert-email: [email protected]
2222-
testgrid-dashboards: kops-distro-rhel9, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
2222+
testgrid-dashboards: kops-distro-rhel8, kops-k8s-ci, kops-latest, sig-cluster-lifecycle-kops
22232223
testgrid-days-of-results: '90'
22242224
testgrid-num-failures-to-alert: '10'
22252225
testgrid-tab-name: kops-aws-selinux-alpha

‎config/jobs/kubernetes/sig-storage/sig-storage-gce-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ presubmits:
263263
--admin-access=0.0.0.0/0 \
264264
--kubernetes-feature-gates=SELinuxMount,SELinuxChangePolicy \
265265
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt \
266-
--create-args "--image='rhel-cloud/rhel-9-v20240815' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers='*' --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --gce-service-account=default --set=spec.nodeProblemDetector.enabled=true --set=cluster.spec.cloudProvider.gce.useStartupScript=true" \
266+
--create-args "--image='rhel-cloud/rhel-8-v20250709' --channel=alpha --networking=cilium --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0 --set=cluster.spec.kubeControllerManager.controllers='*' --set=cluster.spec.kubeControllerManager.controllers=selinux-warning-controller --gce-service-account=default --set=spec.nodeProblemDetector.enabled=true --set=cluster.spec.cloudProvider.gce.useStartupScript=true" \
267267
--test=kops \
268268
-- \
269269
--ginkgo-args="--debug -v" \

0 commit comments

Comments
 (0)