mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-06 09:39:36 +00:00
7ea6f13154
* netpol: Add dual-stack support This change allows to define two cluster CIDRs for compatibility with Kubernetes dual-stuck, with an assumption that two CIDRs are usually IPv4 and IPv6. It does that by levearaging changes in out kube-router fork, with the following downstream release: https://github.com/k3s-io/kube-router/releases/tag/v1.3.2%2Bk3s Signed-off-by: Michal Rostecki <vadorovsky@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Add s390x arch support for k3s (#5018) * Update docs to include s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x drone pipeline Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Install trivy linux arch only for amd64 This is done so that trivy is not installed for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch if condition for Dockerfile.test Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch in install script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x GOARCH in build script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add SUFFIX s390x in scripts Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip image scan for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update klipper-lb to version v0.3.5 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update traefik version to v2.6.2 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update registry to v2.8.1 in tests which supports s390x Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip compact tests for s390x arch This is done because compact test require a previous k3s version which supports s390x and it is not available Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Increase k3s-root version to v0.10.0 which includes s390x support Signed-off-by: Derek Nola <derek.nola@suse.com> Co-authored-by: Michal Rostecki <vadorovsky@gmail.com> Co-authored-by: Sakala Venkata Krishna Rohit <rohitsakala@gmail.com>
59 lines
1.5 KiB
Bash
Executable File
59 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
GO=${GO-go}
|
|
ARCH=${ARCH:-$("${GO}" env GOARCH)}
|
|
SUFFIX="-${ARCH}"
|
|
GIT_TAG=$DRONE_TAG
|
|
TREE_STATE=clean
|
|
COMMIT=$DRONE_COMMIT
|
|
|
|
if [ -d .git ]; then
|
|
if [ -z "$GIT_TAG" ]; then
|
|
GIT_TAG=$(git tag -l --contains HEAD | head -n 1)
|
|
fi
|
|
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
|
|
DIRTY="-dirty"
|
|
TREE_STATE=dirty
|
|
fi
|
|
|
|
COMMIT=$(git log -n3 --pretty=format:"%H %ae" | grep -v ' drone@localhost$' | cut -f1 -d\ | head -1)
|
|
if [ -z "${COMMIT}" ]; then
|
|
COMMIT=$(git rev-parse HEAD || true)
|
|
fi
|
|
fi
|
|
|
|
VERSION_CONTAINERD=$(grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}')
|
|
if [ -z "$VERSION_CONTAINERD" ]; then
|
|
VERSION_CONTAINERD="v0.0.0"
|
|
fi
|
|
|
|
VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}')
|
|
if [ -z "$VERSION_CRICTL" ]; then
|
|
VERSION_CRICTL="v0.0.0"
|
|
fi
|
|
|
|
VERSION_K8S=$(grep 'k8s.io/kubernetes v' go.mod | head -n1 | awk '{print $2}')
|
|
if [ -z "$VERSION_K8S" ]; then
|
|
VERSION_K8S="v0.0.0"
|
|
fi
|
|
|
|
VERSION_RUNC=$(grep github.com/opencontainers/runc go.mod | head -n1 | awk '{print $4}')
|
|
if [ -z "$VERSION_RUNC" ]; then
|
|
VERSION_RUNC="v0.0.0"
|
|
fi
|
|
|
|
VERSION_CNIPLUGINS="v0.9.1-k3s1"
|
|
|
|
VERSION_ROOT="v0.10.0"
|
|
|
|
if [[ -n "$GIT_TAG" ]]; then
|
|
if [[ ! "$GIT_TAG" =~ ^"$VERSION_K8S"[+-] ]]; then
|
|
echo "Tagged version '$GIT_TAG' does not match expected version '$VERSION_K8S[+-]*'" >&2
|
|
exit 1
|
|
fi
|
|
VERSION=$GIT_TAG
|
|
else
|
|
VERSION="$VERSION_K8S+k3s-${COMMIT:0:8}$DIRTY"
|
|
fi
|
|
VERSION_TAG="$(sed -e 's/+/-/g' <<< "$VERSION")"
|