Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finish switching from GKE_BRANCH to GKE_VERSION (from #5730) #5780

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Finish switching from GKE_BRANCH to GKE_VERSION (from #5730) #5780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions script/e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ KAPP_CONTROLLER_VERSION=${KAPP_CONTROLLER_VERSION:-"v0.42.0"}
CHARTMUSEUM_VERSION=${CHARTMUSEUM_VERSION:-"3.9.1"}
# check latest flux releases at https://github.com/fluxcd/flux2/releases
FLUX_VERSION=${FLUX_VERSION:-"v0.37.0"}
GKE_BRANCH=${GKE_BRANCH:-}
GKE_VERSION=${GKE_VERSION:-}
IMG_PREFIX=${IMG_PREFIX:-"kubeapps/"}
TESTS_GROUP=${TESTS_GROUP:-"${ALL_TESTS}"}
DEBUG_MODE=${DEBUG_MODE:-false}
Expand Down Expand Up @@ -62,7 +62,7 @@ fi
. "${ROOT_DIR}/script/lib/libutil.sh"

# Get the load balancer IP
if [[ -z "${GKE_BRANCH-}" ]]; then
if [[ -z "${GKE_VERSION-}" ]]; then
LOAD_BALANCER_IP=$DEX_IP
else
LOAD_BALANCER_IP=$(kubectl -n nginx-ingress get service nginx-ingress-ingress-nginx-controller -o jsonpath="{.status.loadBalancer.ingress[].ip}")
Expand All @@ -77,7 +77,7 @@ fi
info "###############################################################################################"
info "DEBUG_MODE: ${DEBUG_MODE}"
info "TESTS_GROUP: ${TESTS_GROUP}"
info "GKE_BRANCH: ${GKE_BRANCH}"
info "GKE_VERSION: ${GKE_VERSION}"
info "ROOT_DIR: ${ROOT_DIR}"
info "USE_MULTICLUSTER_OIDC_ENV: ${USE_MULTICLUSTER_OIDC_ENV}"
info "OLM_VERSION: ${OLM_VERSION}"
Expand Down Expand Up @@ -247,10 +247,10 @@ installFlux() {
url="https://github.com/fluxcd/flux2/releases/download/${release}/install.yaml"
namespace=flux-system

# this is a workaround for flux e2e tests failing when run by GitHub Action Runners
# this is a workaround for flux e2e tests failing when run by GitHub Action Runners
# due to not being able to deploy source-controller pod error:
# Warning FailedScheduling 19s (x7 over 6m) default-scheduler 0/1 nodes are available: 1 Insufficient cpu.
curl -o /tmp/flux_install.yaml -LO "${url}"
curl -o /tmp/flux_install.yaml -LO "${url}"
cat /tmp/flux_install.yaml | sed -e 's/cpu: 100m/cpu: 75m/g' | kubectl apply -f -

# wait for deployments to be ready
Expand Down Expand Up @@ -353,7 +353,7 @@ elapsedTimeSince() {

[[ "${DEBUG_MODE}" == "true" ]] && set -x;

if [[ "${DEBUG_MODE}" == "true" && -z ${GKE_BRANCH} ]]; then
if [[ "${DEBUG_MODE}" == "true" && -z ${GKE_VERSION} ]]; then
info "Docker images loaded in the cluster:"
docker exec kubeapps-ci-control-plane crictl images
fi
Expand Down Expand Up @@ -438,7 +438,7 @@ info "Waiting for Kubeapps components to be ready (local chart)..."
k8s_wait_for_deployment kubeapps kubeapps-ci

# Setting up local Docker registry if not in GKE
if [[ -z "${GKE_BRANCH-}" ]]; then
if [[ -z "${GKE_VERSION-}" ]]; then
setupLocalDockerRegistry
pushLocalChart
fi
Expand Down Expand Up @@ -575,7 +575,7 @@ fi
###########################################
######## Multi-cluster tests group ########
###########################################
if [[ -z "${GKE_BRANCH-}" && ("${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${MULTICLUSTER_TESTS}") ]]; then
if [[ -z "${GKE_VERSION-}" && ("${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${MULTICLUSTER_TESTS}") ]]; then
sectionStartTime=$(date +%s)
info "Running multi-cluster integration tests..."
test_command="
Expand Down Expand Up @@ -687,7 +687,7 @@ if [[ "${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${OPERATOR_TEST
sectionStartTime=$(date +%s)
## Upgrade and run operator test
# Operators are not supported in GKE 1.14 and flaky in 1.15, skipping test
if [[ -z "${GKE_BRANCH-}" ]] && [[ -n "${TEST_OPERATORS-}" ]]; then
if [[ -z "${GKE_VERSION-}" ]] && [[ -n "${TEST_OPERATORS-}" ]]; then
installOLM "${OLM_VERSION}"

# Update Kubeapps settings to enable operators and hence proxying
Expand Down Expand Up @@ -731,7 +731,7 @@ fi
############################################################
######## Multi-cluster without Kubeapps tests group ########
############################################################
if [[ -z "${GKE_BRANCH-}" && ("${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${MULTICLUSTER_NOKUBEAPPS_TESTS}") ]]; then
if [[ -z "${GKE_VERSION-}" && ("${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${MULTICLUSTER_NOKUBEAPPS_TESTS}") ]]; then
sectionStartTime=$(date +%s)
info "Running multi-cluster (without Kubeapps cluster) integration tests..."

Expand Down
2 changes: 1 addition & 1 deletion site/netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ command = "hugo --gc --minify --enableGitInfo"
ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ."

[context.production.environment]
HUGO_VERSION = "0.104.3"
HUGO_VERSION = "0.107.0"
HUGO_ENV = "production"
HUGO_ENABLEGITINFO = "true"

Expand Down