diff --git a/charts/README.md b/charts/README.md index 77c9bb3c2..021c1a336 100644 --- a/charts/README.md +++ b/charts/README.md @@ -1,5 +1,3 @@ # RabbitMQ Cluster Helm chart This folder contains the `rabbitmq` Helm chart to deploy a `RabbitmqCluster` resource. - -The `rabbitmq` chart can also be used in combination with [Tanzu Service Manager](https://docs.pivotal.io/tanzu-service-manager/) - files in the `tsmgr` directory are related to that integration. diff --git a/charts/rabbitmq/test.sh b/charts/rabbitmq/test.sh index cea7f6343..971e606ab 100755 --- a/charts/rabbitmq/test.sh +++ b/charts/rabbitmq/test.sh @@ -15,7 +15,7 @@ chart=$(helm package . | awk '{print $NF}') helm template $chart -f example-configurations.yaml > template-output -# it should be updated if we add any new configurations and when we modify plans/example-configurations.yaml +# it should be updated if we add any new configurations diff -u template-output expected-template-output && echo "Successfully rendered the template" diff --git a/charts/tsmgr/bind.yaml b/charts/tsmgr/bind.yaml deleted file mode 100644 index c93f9c394..000000000 --- a/charts/tsmgr/bind.yaml +++ /dev/null @@ -1,78 +0,0 @@ -# RabbitMQ Cluster Operator -# -# Copyright 2020 VMware, Inc. All Rights Reserved. -# -# This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License"). You may not use this product except in compliance with the Mozilla Public License. -# -# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. - -template: | - local clientFilterFunc(j) = std.length(std.findSubstr("rabbitmq", j.name)) > 0; - local service = std.filter(clientFilterFunc, $.services)[0]; - local secretFilterFunc(j) = std.length(std.findSubstr("rabbitmq-default-user", j.name)) > 0; - local defaultUser = std.filter(secretFilterFunc, $.secrets); - - local vhost = "%2F"; - local ingress = if service.spec.type == "LoadBalancer" then - if std.objectHas(service.status.loadBalancer.ingress[0], "hostname") then - service.status.loadBalancer.ingress[0].hostname - else - service.status.loadBalancer.ingress[0].ip - else - service.spec.clusterIP; - local defaultUserUsername = defaultUser[0].data['username']; - local defaultUserPassword = defaultUser[0].data['password']; - local mgmtURI = "http://" + ingress + ":15672"; - local apiURI = "http://" + defaultUserUsername + ":" + defaultUserPassword + "@" + ingress + ":15672/api/"; - local amqpURI = "amqp://" + defaultUserUsername + ":" + defaultUserPassword + "@" + ingress + "/" + vhost; - { - "hostname": ingress, - "username": defaultUserUsername, - "password": defaultUserPassword, - "dashboard_url": mgmtURI, - "hostnames": [ - ingress - ], - "http_api_uri": apiURI, - "http_api_uris": [ - apiURI - ], - "ssl": false, - "uri": amqpURI, - "uris": [ - amqpURI - ], - "vhost": vhost, - "protocols": { - "amqp": { - "host": ingress, - "hosts": [ - ingress - ], - "password": defaultUserPassword, - "port": 5672, - "ssl": false, - "uri": amqpURI, - "uris": [ - amqpURI - ], - "username": defaultUserUsername, - "vhost": vhost - }, - "management": { - "host": ingress, - "hosts": [ - ingress - ], - "password": defaultUserPassword, - "path": "/api/", - "port": 15672, - "ssl": false, - "uri": apiURI, - "uris": [ - apiURI - ], - "username": defaultUserUsername - } - }, - } diff --git a/charts/tsmgr/plans.yaml b/charts/tsmgr/plans.yaml deleted file mode 100755 index 6dca48ca8..000000000 --- a/charts/tsmgr/plans.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# RabbitMQ Cluster Operator -# -# Copyright 2020 VMware, Inc. All Rights Reserved. -# -# This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License"). You may not use this product except in compliance with the Mozilla Public License. -# -# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. - -- name: "single" - description: "single-node RabbitMQ" - file: "single.yaml" -- name: "ha" - description: "3-node RabbitMQ" - file: "ha.yaml" diff --git a/charts/tsmgr/plans/ha.yaml b/charts/tsmgr/plans/ha.yaml deleted file mode 100644 index 30b49ea4d..000000000 --- a/charts/tsmgr/plans/ha.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# RabbitMQ Cluster Operator -# -# Copyright 2020 VMware, Inc. All Rights Reserved. -# -# This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License"). You may not use this product except in compliance with the Mozilla Public License. -# -# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. -replicas: 3 diff --git a/charts/tsmgr/plans/single.yaml b/charts/tsmgr/plans/single.yaml deleted file mode 100644 index b831ba821..000000000 --- a/charts/tsmgr/plans/single.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# RabbitMQ Cluster Operator -# -# Copyright 2020 VMware, Inc. All Rights Reserved. -# -# This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License"). You may not use this product except in compliance with the Mozilla Public License. -# -# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. -replicas: 1