Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Merge pull request #795 from damemi/update-e2e

Browse Source 
Update e2e test versions
This commit is contained in:
Kubernetes Prow Robot
2022-05-12 09:29:14 -07:00
committed by GitHub
parent 028f205e8c 6e84d0a6ba
commit 3c8d6c4d53
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -24,7 +24,7 @@ ARCHS = amd64 arm arm64
LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitbranch=${BRANCH} -X ${LDFLAG_LOCATION}.gitsha1=${SHA1}" LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitbranch=${BRANCH} -X ${LDFLAG_LOCATION}.gitsha1=${SHA1}"
GOLANGCI_VERSION := v1.43.0 GOLANGCI_VERSION := v1.46.1
HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null) HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null)
# REGISTRY is the container registry to push # REGISTRY is the container registry to push
@@ -144,4 +144,4 @@ test-helm: ensure-helm-install
ensure-helm-install: ensure-helm-install:
ifndef HAS_HELM ifndef HAS_HELM
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && chmod 700 ./get_helm.sh && ./get_helm.sh curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && chmod 700 ./get_helm.sh && ./get_helm.sh
endif endif

2
hack/verify-gofmt.sh
View File

@@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/..
GO_VERSION=($(go version)) GO_VERSION=($(go version))
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.14|go1.15|go1.16|go1.17') ]]; then if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.14|go1.15|go1.16|go1.17|go1.18') ]]; then
echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
exit 1 exit 1
fi fi

8
pkg/descheduler/strategies/duplicates_test.go
View File

@@ -378,7 +378,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
node.Spec.Taints = []v1.Taint{ node.Spec.Taints = []v1.Taint{
{ {
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
Key: "node-role.kubernetes.io/master", Key: "node-role.kubernetes.io/control-plane",
}, },
} }
} }
@@ -387,7 +387,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
if node.ObjectMeta.Labels == nil { if node.ObjectMeta.Labels == nil {
node.ObjectMeta.Labels = map[string]string{} node.ObjectMeta.Labels = map[string]string{}
} }
node.ObjectMeta.Labels["node-role.kubernetes.io/master"] = "" node.ObjectMeta.Labels["node-role.kubernetes.io/control-plane"] = ""
} }
setWorkerLabel := func(node *v1.Node) { setWorkerLabel := func(node *v1.Node) {
@@ -407,7 +407,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
{ {
MatchExpressions: []v1.NodeSelectorRequirement{ MatchExpressions: []v1.NodeSelectorRequirement{
{ {
Key: "node-role.kubernetes.io/master", Key: "node-role.kubernetes.io/control-plane",
Operator: v1.NodeSelectorOpDoesNotExist, Operator: v1.NodeSelectorOpDoesNotExist,
}, },
{ {
@@ -431,7 +431,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
{ {
MatchExpressions: []v1.NodeSelectorRequirement{ MatchExpressions: []v1.NodeSelectorRequirement{
{ {
Key: "node-role.kubernetes.io/master", Key: "node-role.kubernetes.io/control-plane",
Operator: v1.NodeSelectorOpDoesNotExist, Operator: v1.NodeSelectorOpDoesNotExist,
}, },
{ {

2
pkg/descheduler/strategies/nodeutilization/nodeutilization.go
View File

@@ -75,7 +75,7 @@ func validateNodeUtilizationParams(params *api.StrategyParameters) error {
// validateThresholds checks if thresholds have valid resource name and resource percentage configured // validateThresholds checks if thresholds have valid resource name and resource percentage configured
func validateThresholds(thresholds api.ResourceThresholds) error { func validateThresholds(thresholds api.ResourceThresholds) error {
if thresholds == nil || len(thresholds) == 0 { if len(thresholds) == 0 {
return fmt.Errorf("no resource threshold is configured") return fmt.Errorf("no resource threshold is configured")
} }
for name, percent := range thresholds { for name, percent := range thresholds {

2
test/e2e/e2e_test.go
View File

@@ -1331,7 +1331,7 @@ func splitNodesAndWorkerNodes(nodes []v1.Node) ([]*v1.Node, []*v1.Node) {
for i := range nodes { for i := range nodes {
node := nodes[i] node := nodes[i]
allNodes = append(allNodes, &node) allNodes = append(allNodes, &node)
if _, exists := node.Labels["node-role.kubernetes.io/master"]; !exists { if _, exists := node.Labels["node-role.kubernetes.io/control-plane"]; !exists {
workerNodes = append(workerNodes, &node) workerNodes = append(workerNodes, &node)
} }
} }

4
test/run-e2e-tests.sh
View File

@@ -20,9 +20,9 @@ set -o nounset
# This just runs e2e tests. # This just runs e2e tests.
if [ -n "$KIND_E2E" ]; then if [ -n "$KIND_E2E" ]; then
K8S_VERSION=${KUBERNETES_VERSION:-v1.21.1} K8S_VERSION=${KUBERNETES_VERSION:-v1.24.0}
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/ curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/
wget https://github.com/kubernetes-sigs/kind/releases/download/v0.11.0/kind-linux-amd64 wget https://github.com/kubernetes-sigs/kind/releases/download/v0.13.0/kind-linux-amd64
chmod +x kind-linux-amd64 chmod +x kind-linux-amd64
mv kind-linux-amd64 kind mv kind-linux-amd64 kind
export PATH=$PATH:$PWD export PATH=$PATH:$PWD