Skip to content

Commit

Permalink
Merge pull request #789 from mikenairn/repo_tidy
Browse files Browse the repository at this point in the history
Remove unnecessary dependencies and align local setup and quickstart scripts
  • Loading branch information
maleck13 authored Feb 26, 2024
2 parents acb7043 + eecbc82 commit f861eef
Show file tree
Hide file tree
Showing 51 changed files with 197 additions and 2,029 deletions.
25 changes: 1 addition & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ local-setup-kind: kind ## Setup kind clusters for multi cluster traffic controll
./hack/local-setup-kind.sh

.PHONY: local-setup-mgc
local-setup-mgc: kustomize helm yq dev-tls istioctl operator-sdk clusteradm subctl ## Setup multi cluster traffic controller locally onto kind clusters.
local-setup-mgc: kustomize helm yq operator-sdk clusteradm ## Setup multi cluster traffic controller locally onto kind clusters.
./hack/local-setup-mgc.sh

.PHONY: local-cleanup
Expand All @@ -119,29 +119,6 @@ ifndef ignore-not-found
ignore-not-found = false
endif


.PHONY: deploy-sample-applicationset
deploy-sample-applicationset:
kubectl apply -f ./samples/argocd-applicationset/echo-applicationset.yaml

.PHONY: thanos-manifests
thanos-manifests: ./hack/thanos/thanos_build.sh ./hack/thanos/thanos.jsonnet
./hack/thanos/thanos_build.sh

DEV_TLS_DIR = config/webhook-setup/control/tls
DEV_TLS_CRT ?= $(DEV_TLS_DIR)/tls.crt
DEV_TLS_KEY ?= $(DEV_TLS_DIR)/tls.key

.PHONY: dev-tls
dev-tls: $(DEV_TLS_CRT) ## Generate dev tls webhook cert if necessary.
$(DEV_TLS_CRT):
openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout $(DEV_TLS_KEY) -out $(DEV_TLS_CRT) -subj "/C=IE/O=Red Hat Ltd/OU=HCG/CN=webhook.172.31.0.2.nip.io" -addext "subjectAltName = DNS:webhook.172.31.0.2.nip.io"

.PHONY: clear-dev-tls
clear-dev-tls:
-rm -f $(DEV_TLS_CRT)
-rm -f $(DEV_TLS_KEY)

.PHONY: skupper-setup
skupper-setup:
./hack/skupper/skupper-setup.sh
29 changes: 1 addition & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@ Key Features:
- Health checks to detect and take remedial action against unhealthy endpoints
- Cloud DNS provider integrations (AWS route 53) with new ones being added (google DNS)


When deploying the multicluster gateway controller using the make targets, the following will be created:
* Kind cluster(s)
* Gateway API CRDs in the control plane cluster
* Ingress controller
* Cert manager
* ArgoCD instance
* K8s Dashboard
* LetsEncrypt certs



## Prerequisites:
* AWS or GCP
Expand Down Expand Up @@ -71,28 +66,7 @@ When deploying the multicluster gateway controller using the make targets, the f
make build-gateway-controller run-gateway-controller
```

## 3. Running the agent in the cluster:
1. Build the agent image and load it into the workload cluster
```sh
kubectl config use-context kind-mgc-workload-1
make kind-load-agent
```

1. Deploy the agent to the workload cluster
```sh
make deploy-agent
```

## 4. Running the agent locally
1. Target the workload cluster you wish to run on:
```sh
export KUBECONFIG=./tmp/kubeconfigs/mgc-workload-1.kubeconfig
```
1. Run the agent locally:
```sh
make build-agent run-agent
```
## 5. Clean up local environment
## 3. Clean up local environment
In any terminal window target control plane cluster by:
```bash
kubectl config use-context kind-mgc-control-plane
Expand Down Expand Up @@ -121,4 +95,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

1 change: 0 additions & 1 deletion config/argocd/.gitignore

This file was deleted.

31 changes: 0 additions & 31 deletions config/argocd/ingress-argocd-server.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions config/argocd/kustomization.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/argocd/namespace.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/dashboard/kustomization.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/dashboard/rbac.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/dashboard/service_account.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/external-dns/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions config/external-dns/kustomization.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/external-dns/namespace.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/kuadrant/redis/kustomization.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions config/kuadrant/redis/limitador/kustomization.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions config/kuadrant/redis/limitador/limitador.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/kuadrant/redis/namespace.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions config/kuadrant/redis/redis-pod.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/kuadrant/redis/service.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions config/local-setup/issuer/issuer.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/local-setup/issuer/kustomization.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/ocm/cluster-role-binding.yaml

This file was deleted.

47 changes: 0 additions & 47 deletions config/ocm/cluster-role.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions config/ocm/deployment.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/ocm/namespace.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/ocm/service-account.yaml

This file was deleted.

Loading

0 comments on commit f861eef

Please sign in to comment.