Skip to content

Commit e22b086

Browse files
laveryalaverya
authored
weave-to-flannel testgrid (#4858)
* weave-to-flannel testgrid * all primary * flannel logging fix * return flannel on-pr specs * remove unused upgrade path
1 parent 69df088 commit e22b086

File tree

3 files changed

+8
-134
lines changed

3 files changed

+8
-134
lines changed

‎addons/flannel/0.22.3/install.sh

+1
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ function weave_to_flannel() {
411411

412412
printf "${YELLOW}Once this has been run on all nodes, press enter to continue.${NC}"
413413
if [ "$ASSUME_YES" = "1" ]; then
414+
echo ""
414415
echo "The 'yes' flag has been passed, so we will wait for 5 minutes here for this to run on remote nodes"
415416
sleep 300
416417
else

‎addons/flannel/template/base/install.sh

+1
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ function weave_to_flannel() {
411411

412412
printf "${YELLOW}Once this has been run on all nodes, press enter to continue.${NC}"
413413
if [ "$ASSUME_YES" = "1" ]; then
414+
echo ""
414415
echo "The 'yes' flag has been passed, so we will wait for 5 minutes here for this to run on remote nodes"
415416
sleep 300
416417
else

‎testgrid/specs/customer-migration-specs.yaml

+6-134
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
239239
- name: "Cust sha1:a272ff47a5d0163c65b97c2d2c5acfbc0396f2c4: k8s 1.19 -> 1.21, rook 1.0.4 -> openebs 3.3"
240240
flags: "yes"
241-
numSecondaryNodes: 2
241+
numPrimaryNodes: 3
242242
installerApiEndpoint: https://kurl.sh
243243
installerSpec:
244244
kubernetes:
@@ -366,7 +366,7 @@
366366
367367
- name: "Cust sha1:a272ff47a5d0163c65b97c2d2c5acfbc0396f2c4: k8s 1.21->1.26, openebs 3.3 -> 3.8.0, weave->flannel, docker->containerd"
368368
flags: "yes"
369-
numSecondaryNodes: 2
369+
numPrimaryNodes: 3
370370
installerApiEndpoint: https://kurl.sh
371371
installerSpec:
372372
kubernetes:
@@ -420,7 +420,7 @@
420420
kubernetes:
421421
version: 1.26.6
422422
flannel:
423-
version: 0.22.0
423+
version: 0.22.x # changed from 0.22.0 for testgrid support
424424
openebs:
425425
isLocalPVEnabled: true
426426
localPVStorageClassName: openebs
@@ -477,7 +477,7 @@
477477
478478
- name: "Cust sha1:a272ff47a5d0163c65b97c2d2c5acfbc0396f2c4: k8s 1.19->1.26, rook 1.0.4 -> openebs 3.8.0, weave->flannel, docker->containerd"
479479
flags: "yes"
480-
numSecondaryNodes: 2
480+
numPrimaryNodes: 3
481481
installerApiEndpoint: https://kurl.sh
482482
installerSpec:
483483
kubernetes:
@@ -532,7 +532,7 @@
532532
kubernetes:
533533
version: 1.26.6
534534
flannel:
535-
version: 0.22.3 # changed from 0.22.0 for testgrid support
535+
version: 0.22.x # changed from 0.22.0 for testgrid support
536536
openebs:
537537
isLocalPVEnabled: true
538538
localPVStorageClassName: openebs
@@ -593,134 +593,6 @@
593593
exit 1
594594
fi
595595
596-
597-
598-
- name: "Cust sha1:52ed79b81826a130502b5df18c00d872e70c3b8e: k8s 1.17->1.26, rook 1.0.4 -> openebs 3.8.0, weave->flannel, docker->containerd, singlenode"
599-
flags: "yes"
600-
numSecondaryNodes: 0
601-
installerSpec:
602-
kubernetes:
603-
version: 1.17.13
604-
weave:
605-
version: 2.6.5
606-
podCidrRange: /22
607-
rook:
608-
version: 1.0.4
609-
contour:
610-
version: 1.12.0
611-
registry:
612-
version: 2.7.1
613-
prometheus:
614-
version: 0.44.1
615-
kotsadm:
616-
version: 1.38.0
617-
applicationSlug: cd4pe
618-
velero:
619-
version: 1.5.1
620-
ekco:
621-
version: 0.10.0
622-
containerd:
623-
version: 1.4.3
624-
upgradeSpec:
625-
kubernetes:
626-
containerLogMaxFiles: 10
627-
containerLogMaxSize: 50Mi
628-
version: 1.26.6
629-
flannel:
630-
podCIDRRange: /22
631-
version: 0.22.2
632-
openebs:
633-
isLocalPVEnabled: true
634-
localPVStorageClassName: default
635-
version: 3.8.0
636-
minio:
637-
version: 2023-09-04T19-57-37Z
638-
contour:
639-
version: 1.25.2
640-
registry:
641-
version: 2.8.2
642-
prometheus:
643-
version: 0.68.0-51.0.0
644-
kotsadm:
645-
applicationSlug: puppet-application-manager/standalone
646-
version: 1.102.2
647-
s3Override: https://s3.kurl.sh/external/kotsadm-1.102.2.tar.gz
648-
velero:
649-
version: 1.11.1
650-
ekco:
651-
version: 0.28.3
652-
kurl:
653-
hostPreflights:
654-
apiVersion: troubleshoot.sh/v1beta2
655-
kind: HostPreflight
656-
spec:
657-
analyzers:
658-
- textAnalyze:
659-
checkName: forward-chain-reject-check
660-
fileName: host-collectors/run-host/iptables-forward-chain.txt
661-
outcomes:
662-
- pass:
663-
message: No default REJECT rule found in iptables FORWARD chain
664-
when: 'false'
665-
- fail:
666-
message: >
667-
Default REJECT rule found in iptables FORWARD chain.
668-
669-
Puppet Application Manager does not support a default
670-
REJECT rule in the
671-
672-
FORWARD chain during installation. Run \"iptables -S
673-
FORWARD\" to identify
674-
675-
the REJECT rule, remove it and re-run the installer. It
676-
can be safely
677-
678-
appended to the FORWARD chain after the installation has
679-
completed.
680-
when: 'true'
681-
regex: (?m)^REJECT\\s+all\\s+.*\\s+anywhere\\s+anywhere
682-
collectors:
683-
- run:
684-
args:
685-
- '-L'
686-
- FORWARD
687-
collectorName: iptables-forward-chain
688-
command: iptables
689-
additionalNoProxyAddresses: [ ]
690-
containerd:
691-
version: 1.6.22
692-
metricsServer:
693-
version: 0.6.4
694-
unsupportedOSIDs:
695-
- ubuntu-2204 # this version of docker is too old for 22.04
696-
- rocky-92
697-
- ol-8x
698-
postInstallScript: |
699-
# source helper functions
700-
source /opt/kurl-testgrid/testhelpers.sh
701-
702-
# deploy sample app
703-
install_and_customize_kurl_integration_test_application
704-
postUpgradeScript: |
705-
# source helper functions
706-
source /opt/kurl-testgrid/testhelpers.sh
707-
708-
# ensure we can redeploy sample app
709-
check_and_customize_kurl_integration_test_application
710-
711-
# ensure rook was removed
712-
if kubectl get ns rook-ceph >/dev/null 2>&1; then
713-
echo "rook-ceph namespace still exists"
714-
exit 1
715-
fi
716-
717-
# ensure kubernetes was upgraded
718-
if [[ ! "$(kubectl get nodes --sort-by='{.status.nodeInfo.kubeletVersion}' -o=jsonpath='{.items[0].status.nodeInfo.kubeletVersion}' | sed 's/^v*//')" =~ "1.26" ]]; then
719-
echo "Kubernetes was not upgraded to 1.26.x"
720-
exit 1
721-
fi
722-
723-
724596
- name: "Cust sha1:52ed79b81826a130502b5df18c00d872e70c3b8e: k8s 1.17->1.26, rook 1.0.4 -> 1.12, weave->flannel, docker->containerd"
725597
flags: "yes"
726598
numPrimaryNodes: 3
@@ -755,7 +627,7 @@
755627
version: 1.26.6
756628
flannel:
757629
podCIDRRange: /22
758-
version: 0.22.2
630+
version: 0.22.x # changed from 0.22.2 for testgrid support
759631
rook:
760632
# blockDeviceFilter: vd[b-z] # removed
761633
isBlockStorageEnabled: true

0 commit comments

Comments
 (0)