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

Cleanup some unused code and docs tidy #1360

Merged
merged 4 commits into from
Feb 29, 2024
Merged

Cleanup some unused code and docs tidy #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36a84d4
ci: Remove unreferenced scripts
philipgough Feb 29, 2024
c73a2f4
test: Remove unused function call and code
philipgough Feb 29, 2024
40a6dc6
test: Clean up test script
philipgough Feb 29, 2024
d300d7d
docs: Tidy up simulator docs
philipgough Feb 29, 2024
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
14 changes: 0 additions & 14 deletions cicd-scripts/build.sh
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions cicd-scripts/run-unit-tests.sh
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions collectors/metrics/test/integration/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,13 @@ if [[ "$(uname)" == "Darwin" ]]; then
fi

deploy() {
#setup_kubectl_command
create_kind_hub
deploy_prometheus_operator
deploy_observatorium
deploy_thanos
deploy_metrics_collector $IMAGE_NAME
}

setup_kubectl_command() {
echo "=====Setup kubectl====="
# kubectl required for kind
echo "Install kubectl from openshift mirror (https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.4.14/openshift-client-mac-4.4.14.tar.gz)"
mv README.md README.md.tmp
if [[ "$(uname)" == "Darwin" ]]; then # then we are on a Mac
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.4.14/openshift-client-mac-4.4.14.tar.gz
tar xzvf openshift-client-mac-4.4.14.tar.gz # xzf to quiet logs
rm openshift-client-mac-4.4.14.tar.gz
elif [[ "$(uname)" == "Linux" ]]; then # we are in travis, building in rhel
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.4.14/openshift-client-linux-4.4.14.tar.gz
tar xzvf openshift-client-linux-4.4.14.tar.gz # xzf to quiet logs
rm openshift-client-linux-4.4.14.tar.gz
fi
# this package has a binary, so:

echo "Current directory"
echo $(pwd)
mv README.md.tmp README.md
chmod +x ./kubectl
if [[ ! -f /usr/local/bin/kubectl ]]; then
sudo cp ./kubectl /usr/local/bin/kubectl
fi
# kubectl are now installed in current dir
echo -n "kubectl version" && kubectl version
}

create_kind_hub() {
WORKDIR=$(pwd)
echo "Delete hub if it exists"
Expand Down
3 changes: 2 additions & 1 deletion tools/simulator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Simulator

We have simulators in different subfolder for different scenarios, each simulator subfolder contains its own README, They're linked below!
We have simulators in different subfolder for different scenarios.
Each simulator subfolder contains its own README linked below:

* [alert forwarder simulator](alert-forward)
* [managed cluster simulator](managed-cluster)
Expand Down
82 changes: 39 additions & 43 deletions tools/simulator/managed-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,66 @@
# Managed Cluster Simulator

The managed cluster simulator can be used to set up multiple managed clusters and create the corresponding namespaces in ACM hub cluster, to simulate reconciling thousands of managed clusters for the multicluster-observability-operator.
The managed cluster simulator can be used to set up multiple managed clusters and create the corresponding namespaces
in ACM hub cluster, to simulate reconciling thousands of managed clusters for the multicluster-observability-operator.

_Note:_ this simulator is for testing purpose only.

## Prereqs
## Prerequisites

You must meet the following requirements to setup managed cluster simulator:
The following are requirements to set up the managed cluster simulator:

1. ACM 2.3+ available
2. `MultiClusterObservability` instance available in the hub cluster
1. `ACM` version 2.3+
2. `MultiClusterObservability` instance available in the Hub cluster
3. `kubectl`

## How to use

### Set up managed cluster simulator

1. You can run `setup-managedcluster.sh` followed with two numbers(start index and end index) to set up multiple simulated managed clusters. For example, set up 1-5 simulated managedcluster with the following command:
You can run `setup-managedcluster.sh` followed by two numbers (start and end index) to set up
multiple simulated managed clusters. For example, set up five simulated `managedcluster` with the following command:

```bash
# ./setup-managedcluster.sh 1 5
Creating Simulated managedCluster simulated-1-managedcluster...
managedcluster.cluster.open-cluster-management.io/simulated-1-managedcluster created
Creating Simulated managedCluster simulated-2-managedcluster...
managedcluster.cluster.open-cluster-management.io/simulated-2-managedcluster created
Creating Simulated managedCluster simulated-3-managedcluster...
managedcluster.cluster.open-cluster-management.io/simulated-3-managedcluster created
Creating Simulated managedCluster simulated-4-managedcluster...
managedcluster.cluster.open-cluster-management.io/simulated-4-managedcluster created
Creating Simulated managedCluster simulated-5-managedcluster...
managedcluster.cluster.open-cluster-management.io/simulated-5-managedcluster created
./setup-managedcluster.sh 1 5
```

2. Check if all the managed cluster are set up successfully in ACM hub cluster:
Check if all the `managedcluster` are set up successfully in ACM hub cluster:

```bash
$ oc get managedcluster | grep simulated
simulated-1-managedcluster true 46s
simulated-2-managedcluster true 46s
simulated-3-managedcluster true 45s
simulated-4-managedcluster true 44s
simulated-5-managedcluster true 44s
$ kubectl get managedcluster | grep simulated
# simulated-1-managedcluster true 46s
# simulated-2-managedcluster true 46s
# simulated-3-managedcluster true 45s
# simulated-4-managedcluster true 44s
# simulated-5-managedcluster true 44s
```

3. Check if the `Manifestwork` are created for the simulated managed clusters:
Check if the `Manifestwork` are created for the simulated managed clusters:

```bash
$ for i in $(seq 1 5); do oc -n simulated-$i-managedcluster get manifestwork --no-headers; done
simulated-1-managedcluster-observability 72s
simulated-2-managedcluster-observability 70s
simulated-3-managedcluster-observability 69s
simulated-4-managedcluster-observability 67s
simulated-5-managedcluster-observability 65s
$ for i in $(seq 1 5); do kubectl -n simulated-$i-managedcluster get manifestwork --no-headers; done
# simulated-1-managedcluster-observability 72s
# simulated-2-managedcluster-observability 70s
# simulated-3-managedcluster-observability 69s
# simulated-4-managedcluster-observability 67s
# simulated-5-managedcluster-observability 65s
```

4. Clean up the simulated managed clusters by running the `clean-managedcluster.sh` script followed with two numbers(start index and end index), For example, clean up 1-5 simulated managedcluster with the following command:
Clean up the simulated `managedclusters` by running the
`clean-managedcluster.sh` script followed by two numbers (start and end index).

```
For example, clean up the previously created five simulated `managedclusters` with the following command:

```bash
$ ./clean-managedcluster.sh 1 5
Deleting Simulated managedCluster simulated-1-managedcluster...
managedcluster.cluster.open-cluster-management.io "simulated-1-managedcluster" deleted
Deleting Simulated managedCluster simulated-2-managedcluster...
managedcluster.cluster.open-cluster-management.io "simulated-2-managedcluster" deleted
Deleting Simulated managedCluster simulated-3-managedcluster...
managedcluster.cluster.open-cluster-management.io "simulated-3-managedcluster" deleted
Deleting Simulated managedCluster simulated-4-managedcluster...
managedcluster.cluster.open-cluster-management.io "simulated-4-managedcluster" deleted
Deleting Simulated managedCluster simulated-5-managedcluster...
managedcluster.cluster.open-cluster-management.io "simulated-5-managedcluster" deleted
# Deleting Simulated managedCluster simulated-1-managedcluster...
# managedcluster.cluster.open-cluster-management.io "simulated-1-managedcluster" deleted
# Deleting Simulated managedCluster simulated-2-managedcluster...
# managedcluster.cluster.open-cluster-management.io "simulated-2-managedcluster" deleted
# Deleting Simulated managedCluster simulated-3-managedcluster...
# managedcluster.cluster.open-cluster-management.io "simulated-3-managedcluster" deleted
# Deleting Simulated managedCluster simulated-4-managedcluster...
# managedcluster.cluster.open-cluster-management.io "simulated-4-managedcluster" deleted
# Deleting Simulated managedCluster simulated-5-managedcluster...
# managedcluster.cluster.open-cluster-management.io "simulated-5-managedcluster" deleted
```
25 changes: 1 addition & 24 deletions tools/simulator/managed-cluster/setup-managedcluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,10 @@

set -exo pipefail

WORK_DIR="$(
cd "$(dirname "$0")"
pwd -P
)"
# Create bin directory and add it to PATH
mkdir -p ${WORK_DIR}/bin
export PATH=${PATH}:${WORK_DIR}/bin

KUBECTL="kubectl"
if ! command -v kubectl &>/dev/null; then
if command -v oc &>/dev/null; then
KUBECTL="oc"
else
echo "This script will install kubectl (https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your machine"
if [[ "$(uname)" == "Linux" ]]; then
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
elif [[ "$(uname)" == "Darwin" ]]; then
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/darwin/amd64/kubectl
fi
chmod +x ./kubectl && mv ./kubectl ${WORK_DIR}/bin/kubectl
fi
fi

# creating the simulated managedcluster
for i in $(seq $1 $2); do
echo "Creating Simulated managedCluster simulated-${i}-managedcluster..."
cat <<EOF | ${KUBECTL} apply -f -
cat <<EOF | kubectl apply -f -
apiVersion: cluster.open-cluster-management.io/v1
kind: ManagedCluster
metadata:
Expand Down
Loading