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.

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

MetalLB: Remove MetalLB deployment scripts #1390

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ clouds.yaml
_clouds_yaml
metal3-dev/deployment-*.yaml
assets/generated
metallb/frr/

# Conditionally created for appropriate environments
assets/templates/99_master-chronyd-redhat.yaml
Expand Down
14 changes: 0 additions & 14 deletions 06_create_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,6 @@ if [[ ${NUM_EXTRA_WORKERS} -ne 0 && -d "${OCP_DIR}/extras" ]]; then
oc create secret generic extraworkers-secret --from-file="${OCP_DIR}/extras/" -n openshift-machine-api
fi

if [[ ! -z "${ENABLE_METALLB}" ]]; then

if [[ -z ${METALLB_IMAGE_BASE} ]]; then
export METALLB_IMAGE_BASE=$(\
jq -r .references.spec.tags[0].from.name ${OCP_DIR}/release_info.json | sed -e 's/@.*$//g')
export METALLB_IMAGE_TAG="metallb"
export FRR_IMAGE_TAG="metallb-frr"
fi

pushd metallb
./configure_metallb.sh
popd
fi

if [[ ! -z "${ENABLE_VIRTUAL_MEDIA_VIA_EXTERNAL_NETWORK}" ]]; then
oc patch provisioning provisioning-configuration --type merge -p "{\"spec\":{\"virtualMediaViaExternalNetwork\":true}}"
fi
Expand Down
11 changes: 0 additions & 11 deletions config_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,6 @@ set -x
#
#export DISABLE_MULTICAST=false

# ENABLE_METALLB_MODE -
# Enable metallb
# Default is unset.
# Choices: "l2", "bgp"
#
#export ENABLE_METALLB_MODE="l2"
#
# metallb container location (optional)
#export METALLB_IMAGE_BASE=
#export METALLB_IMAGE_TAG=

################################################################################
## Network Settings
##
Expand Down
10 changes: 0 additions & 10 deletions metallb/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions metallb/OWNERS

This file was deleted.

37 changes: 0 additions & 37 deletions metallb/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions metallb/configure_metallb.sh

This file was deleted.

26 changes: 0 additions & 26 deletions metallb/deploy_operator.sh

This file was deleted.

19 changes: 0 additions & 19 deletions metallb/metallb-operator-deploy/controller_manager_patch.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions metallb/metallb-operator-deploy/kustomization.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions metallb/metallb.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions metallb/metallb_common.sh

This file was deleted.

58 changes: 0 additions & 58 deletions metallb/run_e2e.sh

This file was deleted.