Skip to content

Commit a6ebbcd

Browse files
committed
MetalLB: Remove MetalLB deployment scripts
The MetalLB deployment scripts for OCP CI are now part of the openshift/metallb repo: https://github.com/openshift/metallb/tree/main/openshift-ci
1 parent 5bd425e commit a6ebbcd

13 files changed

+83
-216
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ clouds.yaml
88
_clouds_yaml
99
metal3-dev/deployment-*.yaml
1010
assets/generated
11-
metallb/frr/
1211

1312
# Conditionally created for appropriate environments
1413
assets/templates/99_master-chronyd-redhat.yaml

06_create_cluster.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@ if [[ ${NUM_EXTRA_WORKERS} -ne 0 && -d "${OCP_DIR}/extras" ]]; then
6969
oc create secret generic extraworkers-secret --from-file="${OCP_DIR}/extras/" -n openshift-machine-api
7070
fi
7171

72-
if [[ ! -z "${ENABLE_METALLB}" ]]; then
73-
74-
if [[ -z ${METALLB_IMAGE_BASE} ]]; then
75-
export METALLB_IMAGE_BASE=$(\
76-
jq -r .references.spec.tags[0].from.name ${OCP_DIR}/release_info.json | sed -e 's/@.*$//g')
77-
export METALLB_IMAGE_TAG="metallb"
78-
export FRR_IMAGE_TAG="metallb-frr"
79-
fi
80-
81-
pushd metallb
82-
./configure_metallb.sh
83-
popd
84-
fi
85-
8672
if [[ ! -z "${ENABLE_VIRTUAL_MEDIA_VIA_EXTERNAL_NETWORK}" ]]; then
8773
oc patch provisioning provisioning-configuration --type merge -p "{\"spec\":{\"virtualMediaViaExternalNetwork\":true}}"
8874
fi

config_example.sh

Lines changed: 83 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,6 @@ set -x
174174
#
175175
#export DISABLE_MULTICAST=false
176176

177-
# ENABLE_METALLB_MODE -
178-
# Enable metallb
179-
# Default is unset.
180-
# Choices: "l2", "bgp"
181-
#
182-
#export ENABLE_METALLB_MODE="l2"
183-
#
184-
# metallb container location (optional)
185-
#export METALLB_IMAGE_BASE=
186-
#export METALLB_IMAGE_TAG=
187-
188177
################################################################################
189178
## Network Settings
190179
##
@@ -236,7 +225,89 @@ set -x
236225
# More info: https://github.com/openshift/cluster-baremetal-operator/blob/master/api/v1alpha1/provisioning_types.go#L163-L171
237226
#export ENABLE_VIRTUAL_MEDIA_VIA_EXTERNAL_NETWORK=true
238227

239-
# Set the DHCP lease time (Default: 60)
228+
# Enable testing of custom machine-api-operator-image
229+
#export TEST_CUSTOM_MAO=true
230+
231+
# Custom machine-api-operator image with tag
232+
#export CUSTOM_MAO_IMAGE="quay.io/mao-user/machine-api-operator:mao-fix"
233+
234+
# Git repository that is holding any custom machine-api-operator changes
235+
#export REPO_NAME="mao-user"
236+
237+
# Name of branch in the above repo which contains the custom MAO changes
238+
#export MAO_BRANCH="mao-fix"
239+
240+
#export LOCAL_REGISTRY_DNS_NAME="virthost.ostest.test.metalkube.org"
241+
#export LOCAL_REGISTRY_PORT="5000"
242+
243+
# configure username for registry
244+
#export REGISTRY_USER=some-user
245+
246+
# congiugre password for registry user
247+
#export REGISTRY_PASS=some-pass
248+
249+
# configure base directory for registry
250+
#export REGISTRY_DIR=/opt/registry
251+
252+
# configure location of mirror's creds
253+
#export REGISTRY_CREDS=${REGISTRY_CREDS:-$USER/private-mirror.json}
254+
255+
# Install operator-sdk for local testing of baremetal-operator
256+
#export INSTALL_OPERATOR_SDK=1
257+
258+
# Set a custom hostname format for masters. This is a format string that should
259+
# include one %d field, which will be replaced with the number of the node.
260+
#export MASTER_HOSTNAME_FORMAT=master-%d
261+
262+
# Set a custom hostname format for workers. This is a format string that should
263+
# include one %d field, which will be replaced with the number of the node.
264+
#export WORKER_HOSTNAME_FORMAT=worker-%d
265+
266+
# Change VM resources for masters
267+
#export MASTER_MEMORY=16384
268+
#export MASTER_DISK=20
269+
#export MASTER_VCPU=8
270+
271+
# Change VM resources for workers
272+
#export WORKER_MEMORY=8192
273+
#export WORKER_DISK=20
274+
#export WORKER_VCPU=4
275+
276+
# Change VM resources for extra workers. If not supplied defaults to the
277+
# regular workers specs
278+
#export EXTRA_WORKER_MEMORY=8192
279+
#export EXTRA_WORKER_DISK=20
280+
#export EXTRA_WORKER_VCPU=4
281+
282+
# Add extradisks to VMs
283+
# export VM_EXTRADISKS=true
284+
285+
# Configure how many extra disks to add to VMs. Takes a string of disk
286+
# names delimited by spaces. Example "vdb vdc"
287+
# export VM_EXTRADISKS_LIST="vdb vdc"
288+
289+
# Configure size of extra disks added to VMs
290+
# export VM_EXTRADISKS_SIZE="10G"
291+
292+
# Add TPM2.0 emulator to VMs
293+
# export VM_TPM_EMULATOR=true
294+
295+
# Provide additional master/worker ignition configuration, will be
296+
# merged with the installer provided config, can be used to modify
297+
# the default nic configuration etc
298+
#export IGNITION_EXTRA=extra.ign
299+
300+
# Folder where to copy extra manifests for the cluster deployment
301+
#export ASSETS_EXTRA_FOLDER=local_file_path
302+
303+
# Enable FIPS mode
304+
#export FIPS_MODE=true
305+
306+
# In order to test using unicast for keepalived, one needs to disable multicast.
307+
# Setting this variable to true will block multicast via ebtables for both IPv4 and IPv6.
308+
#export DISABLE_MULTICAST=false
309+
310+
# Set the DHCP lease time
240311
#export DHCP_LEASE_EXPIRY=60
241312

242313
# DNS_VIP -

metallb/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

metallb/OWNERS

Lines changed: 0 additions & 7 deletions
This file was deleted.

metallb/README.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

metallb/configure_metallb.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

metallb/deploy_operator.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

metallb/metallb-operator-deploy/controller_manager_patch.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

metallb/metallb-operator-deploy/kustomization.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)