Skip to content

Commit

Permalink
Revert changes to default kurl spec (replicatedhq#2343)
Browse files Browse the repository at this point in the history 
* Revert "update testgrid specs (replicatedhq#2337)"

This reverts commit 2b090bd.

* Revert "update versions (replicatedhq#2326)"

This reverts commit 1a8026b.
  • Loading branch information
@sgalsaleh
sgalsaleh authored Nov 4, 2021
1 parent d4d47ab commit 1bf9476
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 177 deletions.
2 changes: 1 addition & 1 deletion addons/antrea/template/testgrid/rook.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- installerSpec:
kubernetes:
version: "1.19.15"
version: "latest"
rook:
version: "latest"
containerd:
Expand Down
18 changes: 6 additions & 12 deletions addons/containerd/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
version: "latest"
kotsadm:
version: "latest"
longhorn:
version: latest
minio:
version: latest
rook:
version: "latest"
- installerSpec:
kubernetes:
version: "latest"
Expand All @@ -25,10 +23,8 @@
version: "latest"
kotsadm:
version: "latest"
longhorn:
version: latest
minio:
version: latest
rook:
version: "latest"
upgradeSpec:
kubernetes:
version: "latest"
Expand All @@ -41,7 +37,5 @@
version: "latest"
kotsadm:
version: "latest"
longhorn:
version: latest
minio:
version: latest
rook:
version: "latest"
15 changes: 0 additions & 15 deletions addons/ekco/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,6 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: latest
minio:
version: latest
docker:
version: "latest"
ekco:
version: "__testver__"
s3Override: "__testdist__"

- installerSpec:
kubernetes:
version: "1.19.15"
weave:
version: "latest"
rook:
version: "latest"
docker:
Expand Down
6 changes: 2 additions & 4 deletions addons/fluentd/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: latest
minio:
version: latest
rook:
version: "latest"
docker:
version: "latest"
fluentd:
Expand Down
16 changes: 1 addition & 15 deletions addons/kotsadm/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,10 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: latest
minio:
version: latest
docker:
version: "latest"
kotsadm:
version: "__testver__"
s3Override: "__testdist__"
- installerSpec:
kubernetes:
version: "1.19.15"
weave:
version: "latest"
rook:
version: "latest"
docker:
version: "latest"
kotsadm:
version: "__testver__"
s3Override: "__testdist__"
s3Override: "__testdist__"
2 changes: 1 addition & 1 deletion addons/longhorn/template/testgrid/k8s-ctrd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

- installerSpec:
kubernetes:
version: "1.19.15"
version: "latest"
weave:
version: "latest"
containerd:
Expand Down
4 changes: 1 addition & 3 deletions addons/metrics-server/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: "latest"
minio:
rook:
version: "latest"
docker:
version: "latest"
Expand Down
8 changes: 4 additions & 4 deletions addons/minio/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: "latest"
weave:
version: "latest"
longhorn:
rook:
version: "latest"
docker:
version: "latest"
Expand All @@ -15,7 +15,7 @@
# migration from rook-ceph object store to minio
- installerSpec:
kubernetes:
version: "1.19.15"
version: "latest"
weave:
version: "latest"
containerd:
Expand All @@ -26,14 +26,14 @@
version: "latest"
upgradeSpec:
kubernetes:
version: "1.19.15"
version: "latest"
weave:
version: "latest"
containerd:
version: "latest"
kotsadm:
version: "latest"
longhorn:
rook:
version: "latest"
minio:
version: "__testver__"
Expand Down
4 changes: 1 addition & 3 deletions addons/registry/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: "latest"
minio:
rook:
version: "latest"
docker:
version: "latest"
Expand Down
2 changes: 1 addition & 1 deletion addons/rook/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
isBlockStorageEnabled: true
- installerSpec:
kubernetes:
version: "1.19.15"
version: "latest"
weave:
version: "latest"
docker:
Expand Down
4 changes: 1 addition & 3 deletions addons/sonobuoy/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: "latest"
minio:
rook:
version: "latest"
docker:
version: "latest"
Expand Down
4 changes: 1 addition & 3 deletions addons/velero/template/testgrid/k8s-docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
version: "latest"
weave:
version: "latest"
longhorn:
version: "latest"
minio:
rook:
version: "latest"
docker:
version: "latest"
Expand Down
20 changes: 4 additions & 16 deletions packages/kubernetes/template/script.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,8 @@ set -euo pipefail
VERSIONS=()
function find_available_versions() {
docker build -t k8s - < Dockerfile

# Versions 1.21.*
VERSIONS=($(docker run k8s apt list -a kubelet 2>/dev/null | grep -Eo '1\.21\.[0-9]+' | sort -rV | uniq))

local versions120=($(docker run k8s apt list -a kubelet 2>/dev/null | grep -Eo '1\.20\.[0-9]+' | sort -rV | uniq))
if [ ${#versions120[@]} -gt 0 ]; then
echo "Found latest version for Kubernetes 1.20: ${versions120[0]}"
VERSIONS+=("${versions120[0]}")
fi
VERSIONS=($(docker run k8s apt list -a kubelet 2>/dev/null | grep -Eo '1\.[2-9][0-9]\.[0-9]+' | sort -rV | uniq))
echo "Found ${#VERSIONS[*]} versions for Kubernetes 1.20+: ${VERSIONS[*]}"

local versions119=($(docker run k8s apt list -a kubelet 2>/dev/null | grep -Eo '1\.19\.[0-9]+' | sort -rV | uniq))
if [ ${#versions119[@]} -gt 0 ]; then
Expand Down Expand Up @@ -102,14 +95,9 @@ function generate_conformance_package() {
}

function update_available_versions() {
local versions121=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.21' ) )
if [ ${#versions121[@]} -gt 0 ]; then
sed -i "/cron-kubernetes-update-121/c\ \"$(echo ${versions121[0]} | sed 's/ /", "/g')\", \/\/ cron-kubernetes-update-121" ../../../web/src/installers/versions.js
fi

local versions120=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.20' ) )
local versions120=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.2' ) )
if [ ${#versions120[@]} -gt 0 ]; then
sed -i "/cron-kubernetes-update-120/c\ \"$(echo ${versions120[0]} | sed 's/ /", "/g')\", \/\/ cron-kubernetes-update-120" ../../../web/src/installers/versions.js
sed -i "/cron-kubernetes-update-120/c\ \"$(echo ${versions120[*]} | sed 's/ /", "/g')\", \/\/ cron-kubernetes-update-120" ../../../web/src/installers/versions.js
fi

local version119=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.19' ) )
Expand Down
6 changes: 2 additions & 4 deletions testgrid/specs/deploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
version: latest
contour:
version: latest
longhorn:
version: "latest"
minio:
version: "latest"
rook:
version: latest
registry:
version: latest
prometheus:
Expand Down
26 changes: 2 additions & 24 deletions testgrid/specs/latest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
version: latest
contour:
version: latest
longhorn:
version: "latest"
minio:
version: "latest"
rook:
version: latest
registry:
version: latest
prometheus:
Expand Down Expand Up @@ -42,23 +40,3 @@
version: latest
kotsadm:
version: latest
- name: rook-latest
installerSpec:
kubernetes:
version: 1.19.15
docker:
version: latest
weave:
version: latest
contour:
version: latest
rook:
version: latest
registry:
version: latest
prometheus:
version: latest
ekco:
version: latest
kotsadm:
version: latest
2 changes: 1 addition & 1 deletion testgrid/tgrun/hack/test-spec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: "latest"
weave:
version: "2.6.5"
longhorn:
rook:
version: "latest"
contour:
version: "latest"
Expand Down
Loading

0 comments on commit 1bf9476

Please sign in to comment.