Skip to content

Commit e043b7f

Browse files
committed
metallb: Remove metallb-operator submodule and all metallb references
MetalLB is no longer needed in this repository. This removes the git submodule, feature-configs, test paths, namespace variables, and all related script/documentation references.
1 parent bccbc8b commit e043b7f

18 files changed

Lines changed: 8 additions & 109 deletions

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "cnf-tests/submodules/metallb-operator"]
2-
path = cnf-tests/submodules/metallb-operator
3-
url = https://github.com/openshift/metallb-operator.git
41
[submodule "cnf-tests/submodules/sriov-network-operator"]
52
path = cnf-tests/submodules/sriov-network-operator
63
url = https://github.com/openshift/sriov-network-operator.git

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#TODO add default features here
2-
export FEATURES?=sctp performance vrf container-mount-namespace metallb tuningcni bondcni knmstate
2+
export FEATURES?=sctp performance vrf container-mount-namespace tuningcni bondcni knmstate
33
export SKIP_TESTS?=
44
export FOCUS_TESTS?=
5-
export METALLB_OPERATOR_TARGET_COMMIT?=main
65
export SRIOV_NETWORK_OPERATOR_TARGET_COMMIT?=main
76
export CLUSTER_NODE_TUNING_OPERATOR_TARGET_COMMIT?=main
87
IMAGE_BUILD_CMD ?= "docker"

cnf-tests/README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ Table of Contents
1515

1616
The conformance test suites verify that the operators we maintain are working properly on CNF-enabled clusters. The suites are "validationsuite", "configsuite", and "cnftests". The underlying Ginkgo test suites run by each suite can be found in the `TESTS_PATHS` variable in `hack/common.sh` in the root directory.
1717

18-
To prevent dependency conflicts, we use git submodules to store external repositories: `cluster-node-tuning-operator`, `metallb-operator`, and `sriov-network-operator`, in the path `cnf-tests/submodules`.
18+
To prevent dependency conflicts, we use git submodules to store external repositories: `cluster-node-tuning-operator` and `sriov-network-operator`, in the path `cnf-tests/submodules`.
1919

2020

2121
To specify the desired commit of the external repositories, we expose the following environment variables:
2222

2323
```
24-
export METALLB_OPERATOR_TARGET_COMMIT?=main
2524
export SRIOV_NETWORK_OPERATOR_TARGET_COMMIT?=main
2625
export CLUSTER_NODE_TUNING_OPERATOR_TARGET_COMMIT?=main
2726
```
@@ -40,7 +39,7 @@ We invoke the tests using the Ginkgo CLI tool.
4039
**SKIP_TESTS**: Translates to the ginkgo skip flag.
4140
**FEATURES** and **FOCUS_TESTS**: Translates to the ginkgo focus flag.
4241
**GINKGO_PARAMS**: Provide any additional valid ginkgo parameters.
43-
**EXTERNAL_SUITES**: Specifies which external test suites to run; options include: (integration/metallb/nto/sriov/nto-performance)
42+
**EXTERNAL_SUITES**: Specifies which external test suites to run; options include: (integration/nto/sriov/nto-performance)
4443
**TESTS_REPORTS_PATH**: Path where the test reports will be stored.
4544
**FAIL_FAST**: Set to "true" to enable the ginkgo `--fail-fast` flag.
4645
**TEST_SUITES**: : Set this if you want to focus on a specific suite; options are: (validationsuite/configsuite/cnftests)
@@ -60,7 +59,7 @@ We invoke the tests using the Ginkgo CLI tool.
6059
- CLEAN_PERFORMANCE_PROFILE - disable performance profile cleanup for faster tests
6160
- PERFORMANCE_PROFILE_MANIFEST_OVERRIDE - performance profile manifest override
6261
- IPERF3_BITRATE_OVERRIDE - set a maximum bitrate for iperf3 to use in ovs_qos tests
63-
- SKIP_LOCAL_RESOURCES - use default test resource of dependant test suites, using hardcoded defaults instead, needed to successfuly run the metallb e2e tests
62+
- SKIP_LOCAL_RESOURCES - use default test resource of dependant test suites, using hardcoded defaults instead
6463

6564
## Test Reports
6665

@@ -72,12 +71,6 @@ The tests produce two kinds of outputs, which are stored in the directory specif
7271
├── junit_cnftests.xml
7372
├── junit_setup.xml
7473
├── junit_validation.xml
75-
├── metallb_failure_report.log
76-
│   └── metallb_MetalLB_deploy_should_have_frr-k8s_pods_in_running_state
77-
│   ├── crs.log
78-
│   ├── nodes.log
79-
│   ├── openshift-metallb-system-pods_logs.log
80-
│   └── openshift-metallb-system-pods_specs.log
8174
├── setup_junit.xml
8275
└── validation_junit.xml
8376
```
@@ -88,7 +81,7 @@ A JUnit-compliant XML file is produced for each test suite: `junit_cnftests.xml`
8881

8982
### Test Failure Report
9083

91-
A report containing information about the cluster state (and resources) for troubleshooting is produced for each failed test. For example, if a test fails in the metallb suite, the logs are dumped into the following file: `metallb_failure_report.log`.
84+
A report containing information about the cluster state (and resources) for troubleshooting is produced for each failed test.
9285

9386
## Gatekeeper
9487

cnf-tests/hack/init-git-submodules.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@ set -x
66
set -e
77

88
if [ -n "$TARGET_RELEASE" ]; then
9-
METALLB_OPERATOR_TARGET_COMMIT="$TARGET_RELEASE"
109
SRIOV_NETWORK_OPERATOR_TARGET_COMMIT="$TARGET_RELEASE"
1110
CLUSTER_NODE_TUNING_OPERATOR_TARGET_COMMIT="$TARGET_RELEASE"
1211
fi
1312

14-
echo "metallb-operator target commit: ${METALLB_OPERATOR_TARGET_COMMIT}"
1513
echo "sriov-operator target commit: ${SRIOV_NETWORK_OPERATOR_TARGET_COMMIT}"
1614
echo "cluster-node-tuning-operator target commit: ${CLUSTER_NODE_TUNING_OPERATOR_TARGET_COMMIT}"
1715

18-
cd submodules/metallb-operator/
19-
git fetch --all
20-
git checkout origin/"${METALLB_OPERATOR_TARGET_COMMIT}"
21-
22-
cd ../sriov-network-operator/
16+
cd submodules/sriov-network-operator/
2317
git fetch --all
2418
git checkout origin/"${SRIOV_NETWORK_OPERATOR_TARGET_COMMIT}"
2519

Lines changed: 0 additions & 1 deletion
This file was deleted.

cnf-tests/testsuites/pkg/namespaces/namespaces.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ var IntelOperator = "vran-acceleration-operators"
3636
// SpecialResourceOperator is the namespace where the SRO is installed
3737
var SpecialResourceOperator = "openshift-special-resource-operator"
3838

39-
// MetalLBOperator is the namespace where the MetalLB Operator is installed
40-
var MetalLBOperator = "openshift-metallb-system"
41-
4239
// SroTestNamespace is the namespace where we run the oot driver builds as part of the sro testing
4340
var SroTestNamespace = "oot-driver"
4441

cnf-tests/testsuites/pkg/utils/reporter.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ func NewReporter(reportPath string) (*k8sreporter.KubernetesReporter, error) {
118118
namespaces.SroTestNamespace: "sro",
119119
namespaces.SroTestNamespace: "sro",
120120
namespaces.BondTestNamespace: "bondcni",
121-
namespaces.MetalLBOperator: "metallb",
122121
namespaces.TuningTest: "tuningcni",
123122
namespaces.Multus: "multus",
124123
}

feature-configs/ci/metallb/kustomization.yaml

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

feature-configs/ci/metallb/operator_subscription.yaml

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

feature-configs/deploy/metallb/kustomization.yaml

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

0 commit comments

Comments
 (0)