Skip to content

Commit

Permalink
MetalLB: Remove MetalLB deployment scripts
Browse files Browse the repository at this point in the history
The MetalLB deployment scripts for OCP CI are now part
of the openshift/metallb repo:
https://github.com/openshift/metallb/tree/main/openshift-ci
  • Loading branch information
sabinaaledort committed Jun 8, 2022
1 parent 5bd425e commit a6ebbcd
Show file tree
Hide file tree
Showing 13 changed files with 83 additions and 216 deletions.
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
95 changes: 83 additions & 12 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 Expand Up @@ -236,7 +225,89 @@ set -x
# More info: https://github.com/openshift/cluster-baremetal-operator/blob/master/api/v1alpha1/provisioning_types.go#L163-L171
#export ENABLE_VIRTUAL_MEDIA_VIA_EXTERNAL_NETWORK=true

# Set the DHCP lease time (Default: 60)
# Enable testing of custom machine-api-operator-image
#export TEST_CUSTOM_MAO=true

# Custom machine-api-operator image with tag
#export CUSTOM_MAO_IMAGE="quay.io/mao-user/machine-api-operator:mao-fix"

# Git repository that is holding any custom machine-api-operator changes
#export REPO_NAME="mao-user"

# Name of branch in the above repo which contains the custom MAO changes
#export MAO_BRANCH="mao-fix"

#export LOCAL_REGISTRY_DNS_NAME="virthost.ostest.test.metalkube.org"
#export LOCAL_REGISTRY_PORT="5000"

# configure username for registry
#export REGISTRY_USER=some-user

# congiugre password for registry user
#export REGISTRY_PASS=some-pass

# configure base directory for registry
#export REGISTRY_DIR=/opt/registry

# configure location of mirror's creds
#export REGISTRY_CREDS=${REGISTRY_CREDS:-$USER/private-mirror.json}

# Install operator-sdk for local testing of baremetal-operator
#export INSTALL_OPERATOR_SDK=1

# Set a custom hostname format for masters. This is a format string that should
# include one %d field, which will be replaced with the number of the node.
#export MASTER_HOSTNAME_FORMAT=master-%d

# Set a custom hostname format for workers. This is a format string that should
# include one %d field, which will be replaced with the number of the node.
#export WORKER_HOSTNAME_FORMAT=worker-%d

# Change VM resources for masters
#export MASTER_MEMORY=16384
#export MASTER_DISK=20
#export MASTER_VCPU=8

# Change VM resources for workers
#export WORKER_MEMORY=8192
#export WORKER_DISK=20
#export WORKER_VCPU=4

# Change VM resources for extra workers. If not supplied defaults to the
# regular workers specs
#export EXTRA_WORKER_MEMORY=8192
#export EXTRA_WORKER_DISK=20
#export EXTRA_WORKER_VCPU=4

# Add extradisks to VMs
# export VM_EXTRADISKS=true

# Configure how many extra disks to add to VMs. Takes a string of disk
# names delimited by spaces. Example "vdb vdc"
# export VM_EXTRADISKS_LIST="vdb vdc"

# Configure size of extra disks added to VMs
# export VM_EXTRADISKS_SIZE="10G"

# Add TPM2.0 emulator to VMs
# export VM_TPM_EMULATOR=true

# Provide additional master/worker ignition configuration, will be
# merged with the installer provided config, can be used to modify
# the default nic configuration etc
#export IGNITION_EXTRA=extra.ign

# Folder where to copy extra manifests for the cluster deployment
#export ASSETS_EXTRA_FOLDER=local_file_path

# Enable FIPS mode
#export FIPS_MODE=true

# In order to test using unicast for keepalived, one needs to disable multicast.
# Setting this variable to true will block multicast via ebtables for both IPv4 and IPv6.
#export DISABLE_MULTICAST=false

# Set the DHCP lease time
#export DHCP_LEASE_EXPIRY=60

# DNS_VIP -
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.

0 comments on commit a6ebbcd

Please sign in to comment.