From 9153b94169d170204858eab5ef9c4521c11bf157 Mon Sep 17 00:00:00 2001 From: the-redback Date: Mon, 6 Aug 2018 11:07:09 +0600 Subject: [PATCH 01/10] Added ElasticsearchVersion, MongoDBVersion, MySQLVersion, MemcachedVersion & RedisVersion default objects --- hack/deploy/kubedb-catalog.yaml | 228 ++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/hack/deploy/kubedb-catalog.yaml b/hack/deploy/kubedb-catalog.yaml index e8d315f08..c2b9dfc0b 100644 --- a/hack/deploy/kubedb-catalog.yaml +++ b/hack/deploy/kubedb-catalog.yaml @@ -42,3 +42,231 @@ spec: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5.7" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" From ed95fc38574a930282b7ac5e8c41ff2067a002c9 Mon Sep 17 00:00:00 2001 From: the-redback Date: Mon, 6 Aug 2018 12:23:28 +0600 Subject: [PATCH 02/10] Remove docker-registry and exporter-tag flag --- chart/kubedb/templates/deployment.yaml | 2 -- hack/deploy/operator.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/chart/kubedb/templates/deployment.yaml b/chart/kubedb/templates/deployment.yaml index 05b848ab5..56d025730 100644 --- a/chart/kubedb/templates/deployment.yaml +++ b/chart/kubedb/templates/deployment.yaml @@ -36,8 +36,6 @@ spec: args: - run - --v=3 - - --docker-registry={{ .Values.kubedb.registry }} - - --exporter-tag={{ .Values.kubedb.tag }} - --governing-service=kubedb - --rbac={{ .Values.rbac.create }} - --secure-port=8443 diff --git a/hack/deploy/operator.yaml b/hack/deploy/operator.yaml index cd26f1f66..b36907d5e 100644 --- a/hack/deploy/operator.yaml +++ b/hack/deploy/operator.yaml @@ -26,8 +26,6 @@ spec: args: - run - --v=3 - - --docker-registry=${KUBEDB_DOCKER_REGISTRY} - - --exporter-tag=${KUBEDB_OPERATOR_TAG} - --governing-service=kubedb - --rbac=${KUBEDB_ENABLE_RBAC} - --secure-port=8443 From c9ec1bf2106ea6bae9cd15af11e75bf7d30be444 Mon Sep 17 00:00:00 2001 From: the-redback Date: Mon, 6 Aug 2018 14:47:12 +0600 Subject: [PATCH 03/10] use `--ignore-not-found=true` istead of `|| true` --- hack/deploy/kubedb.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index 2b10e180a..6cbaef8f2 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -266,8 +266,8 @@ done if [ "$KUBEDB_UNINSTALL" -eq 1 ]; then # delete webhooks and apiservices - kubectl delete validatingwebhookconfiguration -l app=kubedb || true - kubectl delete mutatingwebhookconfiguration -l app=kubedb || true + kubectl delete validatingwebhookconfiguration -l app=kubedb --ignore-not-found=true + kubectl delete mutatingwebhookconfiguration -l app=kubedb --ignore-not-found=true kubectl delete apiservice -l app=kubedb # delete kubedb operator kubectl delete deployment -l app=kubedb --namespace $KUBEDB_NAMESPACE @@ -313,15 +313,15 @@ if [ "$KUBEDB_UNINSTALL" -eq 1 ]; then kubectl patch ${crd}.kubedb.com $name -n $namespace -p '{"metadata":{"finalizers":[]}}' --type=merge # delete crd object echo "deleting ${crd} $namespace/$name" - kubectl delete ${crd}.kubedb.com $name -n $namespace + kubectl delete ${crd}.kubedb.com $name -n $namespace --ignore-not-found=true done # delete crd - kubectl delete crd ${crd}.kubedb.com || true + kubectl delete crd ${crd}.kubedb.com --ignore-not-found=true done # delete user roles - kubectl delete clusterroles kubedb:core:admin kubedb:core:edit kubedb:core:view + kubectl delete clusterroles kubedb:core:admin kubedb:core:edit kubedb:core:view --ignore-not-found=true fi echo @@ -408,6 +408,10 @@ if [ "$KUBEDB_OPERATOR_NAME" = "operator" ]; then done fi +if [ "$KUBEDB_OPERATOR_NAME" != "operator" ]; then + set +e +fi + if [ "$KUBEDB_ENABLE_CATALOG" = true ]; then echo "adding kubedb catalog" ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog.yaml | $ONESSL envsubst | kubectl apply -f - From c09895adaacb9c2d8cfc35bacdce7363cc1f65d7 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 9 Aug 2018 17:29:05 +0600 Subject: [PATCH 04/10] Check if length is 8 before taking the suffix of length 8 --- hack/deploy/kubedb.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index 6cbaef8f2..cd4d0f3ea 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -2,22 +2,22 @@ set -eou pipefail crds=( - dormantdatabases - elasticsearches - elasticsearchversions - etcds - etcdversions - memcacheds - memcachedversions - mongodbs - mongodbversions - mysqls - mysqlversions - postgreses - postgresversions - redises - redisversions - snapshots + dormantdatabases + elasticsearches + elasticsearchversions + etcds + etcdversions + memcacheds + memcachedversions + mongodbs + mongodbversions + mysqls + mysqlversions + postgreses + postgresversions + redises + redisversions + snapshots ) apiServices=(v1alpha1.validators v1alpha1.mutators) @@ -302,10 +302,10 @@ if [ "$KUBEDB_UNINSTALL" -eq 1 ]; then kubectl get ${crd}.kubedb.com --all-namespaces -o yaml >${crd}.yaml fi - for ((i = 0; i < $total; i++ )); do + for ((i = 0; i < $total; i++)); do name=${pairs[$i]} namespace="default" - if [ ${crd: -8} != "versions" ]; then + if [ ${#crd} -lt 8 ] || [ ${crd: -8} != "versions" ]; then namespace=${pairs[$i + 1]} i+=1 fi From 8f433b280759dca6c9fd921d7e604a8cf1eee189 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 9 Aug 2018 17:30:47 +0600 Subject: [PATCH 05/10] added-all --- ca.crt | 17 +++++++++++++++++ ca.key | 27 +++++++++++++++++++++++++++ hack/deploy/kubedb.sh | 4 ++-- server.crt | 18 ++++++++++++++++++ server.key | 27 +++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 ca.crt create mode 100644 ca.key create mode 100644 server.crt create mode 100644 server.key diff --git a/ca.crt b/ca.crt new file mode 100644 index 000000000..12b65c0d1 --- /dev/null +++ b/ca.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICuDCCAaCgAwIBAgIBADANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJjYTAe +Fw0xODA4MDkxMTI5NDJaFw0yODA4MDYxMTI5NDJaMA0xCzAJBgNVBAMTAmNhMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsUE7XVrTcSX2xUxLktFjiQf1 +qx7ZCW0NUh4l5Z8AbGwzJlWNwcRCmXBrqFOaOsCVt00Gshy/LLyw9f4grwsu1rpG +i66pTpfS+5yvyLDK2HgcpTh8qXrKs0LOoZk+4MicJe5Yw3VNTKHKlVoOSuIWq6OD +VdTo5cTqEuSaKI6Zv7YnyiLsaqaou3WeU/VAX0N8fkVuo8rbHmem3GwJvQVL5wlE +YDo3Yp0vpFPyKukOiTMpHwOkyRxZFan1sGXD4LlAcIBbFYegz6y8lM/pXA1wS8Hn +1YGOX6Rf8zzmlftRLMemQ+p1BV5mYw6xASvM4sbI5Z5vKNSkMkF61qs+VmpQpQID +AQABoyMwITAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQsFAAOCAQEAFCQqbDJCUaoZCvX3ckgr8O1VgtQWbNOxrhZrgyQ9wKykU2EC +Tw3T25cY4NoxxYDDuxRgdjZo8Kyb6M12gOan6Y66xIlLGo3Sc7zasX52J39Am74p +UsphDUXrtH3htyoHHV+5j98ffE6s0zK5mP8cP9Y9EB8QPGg5jxFQ8wZS7OinNAcH +79lTbKwL8KVT/LeZskX8GQf31fm0csadZG+QFDRatbXfoRAS/RGeILybkAhXaC5w +gR3Y4SoTrGYbV8b63MGiZu7u4KiBy/gf0PimaJo/LloqCBApzdtVMBH+o4q7FPiJ +KUJHd+cXA4f2WBV7qihU+4UFw4ZjbxHz7xCq/A== +-----END CERTIFICATE----- diff --git a/ca.key b/ca.key new file mode 100644 index 000000000..6b8a45513 --- /dev/null +++ b/ca.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAsUE7XVrTcSX2xUxLktFjiQf1qx7ZCW0NUh4l5Z8AbGwzJlWN +wcRCmXBrqFOaOsCVt00Gshy/LLyw9f4grwsu1rpGi66pTpfS+5yvyLDK2HgcpTh8 +qXrKs0LOoZk+4MicJe5Yw3VNTKHKlVoOSuIWq6ODVdTo5cTqEuSaKI6Zv7YnyiLs +aqaou3WeU/VAX0N8fkVuo8rbHmem3GwJvQVL5wlEYDo3Yp0vpFPyKukOiTMpHwOk +yRxZFan1sGXD4LlAcIBbFYegz6y8lM/pXA1wS8Hn1YGOX6Rf8zzmlftRLMemQ+p1 +BV5mYw6xASvM4sbI5Z5vKNSkMkF61qs+VmpQpQIDAQABAoIBAHec/nN79A15wfHY +D3OO6y0wet6z3WAYABI3F/nA92czCL1IpHVqfErQ60VWzU/yX9WnG+qbrYKB/qSx +jdqxoDT01OAzyDqqB40VaiXy759uRl5UJQO1Qg3/+jJgmGbV2VFbavjTMouQ7oUk +lVqBAS1oFRuZpmRPImoHa+QMfsI4CRKwiv6oaoMt0FSaCdIxmW0qi1QDkl+aY7EO +zcodQW59eyt3wfHc6zjTzVpuirx74zbExsSaeiHCdOUHP4uhslI1mbLQ8+vbfg51 +0LtbYEW0BcAvd1IBZC7iJMHzMaiPRvEHIdlLQWRTWxTFPH3+E3iEzC5McTQg39K+ ++2cm5m0CgYEAy/oyZlzGCDAUzCRkPWpTpjqPlUWqCUMNvzfZxhyjj+t8w89R/g2J +dsZZlkklYUOiS5McFx55q245dxqd8aX6mvbaGIJTcx89v6i7Z35X8x83m3Xent5b +U9lYnfFsikMqX6e7PBPxPAlv46jBFnpGu13vnmLS0D5UJOzlpU8VHHcCgYEA3nZO +OySc1I0owXRTrdiPDdkJ3hOMd763aXGDYHc2j1Y1yRL4nuC4uCgVTzuEVNhgyAs9 +5IuPmcfORvuitoyWixpbuJWbrI2GqHGkCjKdf1ggZMP1BT//YvCZkpdlD5tjSehm +/Atzh2XtpWLVns0RVnfuOy25LCxdhMGuaGjZ7sMCgYEAhj54BR5xxtm+FkytHC5q +NzC7ZsaejdHvrjWXweb/TqzxQ/2iPM2z9tO8CkjBrS3SFmMPTbfk44p7j4OZB3zx +XiOwjgjX2yBoh0cJb6ebQor9EfeVOIGnIZwd0nUdtjFWJfZCJ9wIHDcpyG88BQsc +mhvMpDTuAdfDkTnIOe++OSkCgYBgHuQMf/RXjqqGdBnX6tNc22N9FhtCfiBHqilm +2/uyEUDqIY1VMKn/wCn88y1pb5jZtqnGf1rLyl5ho0aZ88L0Va494j7CXuBJFdkY +IuiUZmKQx26uFwnlGSpyAYJELRLIk2c0DkqbvTnilQLSO677GpTP8yCoan755qnS +KUPI+wKBgQCvXPrWF8Xdx8ibM4fi+dzXd3UU67ZegxlSf3upe3AdUL+VpoMwn6W3 +o4BgDjVnJO5QwXo4Aj/iRHrJ4OtUqAxcy0ecTm8ZyR41Asm6r6npGSsiSa9fT71j +g4/tjKvgDT5U/zv5z8xL9nXXAf6jhR7PylHoBFPw+H5INDe9OGM/Ag== +-----END RSA PRIVATE KEY----- diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index cd4d0f3ea..46e9b9063 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -266,8 +266,8 @@ done if [ "$KUBEDB_UNINSTALL" -eq 1 ]; then # delete webhooks and apiservices - kubectl delete validatingwebhookconfiguration -l app=kubedb --ignore-not-found=true - kubectl delete mutatingwebhookconfiguration -l app=kubedb --ignore-not-found=true + kubectl delete validatingwebhookconfiguration -l app=kubedb || true + kubectl delete mutatingwebhookconfiguration -l app=kubedb || true kubectl delete apiservice -l app=kubedb # delete kubedb operator kubectl delete deployment -l app=kubedb --namespace $KUBEDB_NAMESPACE diff --git a/server.crt b/server.crt new file mode 100644 index 000000000..fe4ec8509 --- /dev/null +++ b/server.crt @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC/DCCAeSgAwIBAgIIGzvs3g62fLYwDQYJKoZIhvcNAQELBQAwDTELMAkGA1UE +AxMCY2EwHhcNMTgwODA5MTEyOTQyWhcNMTkwODA5MTEyOTQzWjARMQ8wDQYDVQQD +EwZzZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGz6Hp/o0B +3lloAEXBmU+fUT/iQQr+ylfteWm1+G+T6P7IpDs+yoSn2RHWggglx5VjXR/x7gE2 +VxT0Wr1mmtKXmrJkJ8vUTAaUw2mgNAKp7L9txtl80WKO2LDZ6bOKUGl9YEr2Y/aI +nCOzjRdcEQqUx2KifUCfm6qByGiXfbOUdhEKXUd/vVx/x7hnrS5TqE0rqUt+S45E +pGRXzXTASH88PVQKelrmrsrRnUwr99CxpHexu/C0dO7/9DGQc3vk4rlOLyKa9E7j +3cmfYqjUVLVq76ZRfJzFip5/+QgALSwxajsoil9SMRYGEn709RL8CBmzByKwRhhX +FDh2pLYcqPm5AgMBAAGjXDBaMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr +BgEFBQcDATAzBgNVHREELDAqgiJrdWJlZGItZXMtb3BlcmF0b3Iua3ViZS1zeXN0 +ZW0uc3ZjhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQBwWpA+5WxCAJwj1LbWLo1+ +dlSpOUtZ4GSw0Pg/Br+EmZ/lL+kHlTHoDXsPimoWp7FJaU19DqM/J5LJD/nghQby +Z2T24LCNLl2fXl1Gm+2L889wl3vTQLRh9MP7ur5+ieJmFio4bw0oeZPtyGwnhIm0 +tqKDcS0JoyZ0ZiITuinS9C/zyKDIPejZKnoyA/NPTOfe4M9QmFTAQxngItJyI1ow +OCU/PKJoL41PIzeVVMkjTItFLO1CC95vXTFkNQTgPRNIqKwWmkB6HeRUX/rfElPs +WndUqCRTjyshwMdHZcAo8MJkI64XLtKaiTr4mPdY7hT5eS3/z/unQZg3X/mNs8xM +-----END CERTIFICATE----- diff --git a/server.key b/server.key new file mode 100644 index 000000000..645093e23 --- /dev/null +++ b/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAxs+h6f6NAd5ZaABFwZlPn1E/4kEK/spX7Xlptfhvk+j+yKQ7 +PsqEp9kR1oIIJceVY10f8e4BNlcU9Fq9ZprSl5qyZCfL1EwGlMNpoDQCqey/bcbZ +fNFijtiw2emzilBpfWBK9mP2iJwjs40XXBEKlMdion1An5uqgchol32zlHYRCl1H +f71cf8e4Z60uU6hNK6lLfkuORKRkV810wEh/PD1UCnpa5q7K0Z1MK/fQsaR3sbvw +tHTu//QxkHN75OK5Ti8imvRO493Jn2Ko1FS1au+mUXycxYqef/kIAC0sMWo7KIpf +UjEWBhJ+9PUS/AgZswcisEYYVxQ4dqS2HKj5uQIDAQABAoIBAGYSDc/j56Mw8/gI +Q8gMnStvfHv95tY/Lnt2nUZWwXpP4hdC8kPfl9HRCW53HhW/bTwxgIgmKKssdE6s +E5eNH1fEjZgMMoLRcYOI/D7K1R9GtFV5BQonOhGawNlwOcRmWnKLMJFlaxpiB5ZU +dszG1wbhgwtngPkw4450RPaaC8vJFdOVPYx0BiG+m2haB0TtMu8EnGheYaqKnquN +zlp68oTRgpgQHrQ1Ht/BGoP5MQWog7RIL+VKfCEEIj2yEtGxqHjGivmAYy+Pw1B1 +qxT30zVOuXdayxhk6+CrZaQoOgEVrAtwvde9/zGcTou2Vaz/aZspZJzMSQIoGyR3 +LTvOgAECgYEA8yAYp6Dr3O/A0NTC8sl64e+zONJA3NfDfSiUVeinUj+jvjvmOO5p +XGI7c9W4AIY1kV7AXsbAPXZYuECz2otmBk3Stsyhoo2EPsCeo7pTRuoyW+dIoLHV +egEHxDaTHvLSi7zjRcPmecMfXwVjJ+BK2bli7mXjlvB1DPqzaKzDcAECgYEA0VbL +OUnhJPLBcE4KVdekg6nE6WtfNu46Emv1GCzXaI/zopeiBwSyc5wY0z0bEIm0cgQZ +fhb8c+nKcEgZhvsIYXODnSlNLqtvWV5Ch0Lmxy95fH4me+OfUdCMUGnKRce6l3QE +GF9ynaoZxEMSucnEAGcO0pMJyQu9DauJ0LR9CbkCgYEA8JpN6+5kHPSj88bq2syr +sFbAHbZtfGCG1SDIk7A3jjzutf+fWa4PVN7eCUdy3gnzj1aet+ynKOwq5sUZeGlF +4W0437DpMO4t9tA27r8hVOfGSI89n9H9+sx0PCjqNdGGrcWTgWJafxuruySguUDN +smQ11Mm+joyOufaMgEWg8AECgYAPPiamET8XlaWIK+aMwZr1C1OPO4Y/VbFczgeW +rw0wS+sNl8TwheMIkAEuwHBMD/rXonzItZvERO28p0NUlMrTbbnTo8I+97Sv6TEm +8DQlpMtPyU+8DaL4LhtJb6qO0jA//u6dZ7XMzSn7JHckmBBxhw+JPbOks/ocGLV8 +QOgp4QKBgB8qD/FAEH89DlzPzLD2JEUdqm412WLUvjCxx3ZoK9PH7R/UpyEVRqJC +xOGPLsBJt17G0S/wXK8Bc5MldsflyboRlTiKTLcERdZcfL+IIwHgO4bZe2nB53zd +wBVaB+NOk0RFY8pKnvnexeovfzdHgJXwfNGJuO8na9W3KLvXyK1c +-----END RSA PRIVATE KEY----- From 1ea5e34ed1f792bcf7d29e081a2c8563fd665e68 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 9 Aug 2018 17:31:19 +0600 Subject: [PATCH 06/10] added-all --- ca.crt | 17 ----------------- ca.key | 27 --------------------------- server.crt | 18 ------------------ server.key | 27 --------------------------- 4 files changed, 89 deletions(-) delete mode 100644 ca.crt delete mode 100644 ca.key delete mode 100644 server.crt delete mode 100644 server.key diff --git a/ca.crt b/ca.crt deleted file mode 100644 index 12b65c0d1..000000000 --- a/ca.crt +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICuDCCAaCgAwIBAgIBADANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJjYTAe -Fw0xODA4MDkxMTI5NDJaFw0yODA4MDYxMTI5NDJaMA0xCzAJBgNVBAMTAmNhMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsUE7XVrTcSX2xUxLktFjiQf1 -qx7ZCW0NUh4l5Z8AbGwzJlWNwcRCmXBrqFOaOsCVt00Gshy/LLyw9f4grwsu1rpG -i66pTpfS+5yvyLDK2HgcpTh8qXrKs0LOoZk+4MicJe5Yw3VNTKHKlVoOSuIWq6OD -VdTo5cTqEuSaKI6Zv7YnyiLsaqaou3WeU/VAX0N8fkVuo8rbHmem3GwJvQVL5wlE -YDo3Yp0vpFPyKukOiTMpHwOkyRxZFan1sGXD4LlAcIBbFYegz6y8lM/pXA1wS8Hn -1YGOX6Rf8zzmlftRLMemQ+p1BV5mYw6xASvM4sbI5Z5vKNSkMkF61qs+VmpQpQID -AQABoyMwITAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG -9w0BAQsFAAOCAQEAFCQqbDJCUaoZCvX3ckgr8O1VgtQWbNOxrhZrgyQ9wKykU2EC -Tw3T25cY4NoxxYDDuxRgdjZo8Kyb6M12gOan6Y66xIlLGo3Sc7zasX52J39Am74p -UsphDUXrtH3htyoHHV+5j98ffE6s0zK5mP8cP9Y9EB8QPGg5jxFQ8wZS7OinNAcH -79lTbKwL8KVT/LeZskX8GQf31fm0csadZG+QFDRatbXfoRAS/RGeILybkAhXaC5w -gR3Y4SoTrGYbV8b63MGiZu7u4KiBy/gf0PimaJo/LloqCBApzdtVMBH+o4q7FPiJ -KUJHd+cXA4f2WBV7qihU+4UFw4ZjbxHz7xCq/A== ------END CERTIFICATE----- diff --git a/ca.key b/ca.key deleted file mode 100644 index 6b8a45513..000000000 --- a/ca.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAsUE7XVrTcSX2xUxLktFjiQf1qx7ZCW0NUh4l5Z8AbGwzJlWN -wcRCmXBrqFOaOsCVt00Gshy/LLyw9f4grwsu1rpGi66pTpfS+5yvyLDK2HgcpTh8 -qXrKs0LOoZk+4MicJe5Yw3VNTKHKlVoOSuIWq6ODVdTo5cTqEuSaKI6Zv7YnyiLs -aqaou3WeU/VAX0N8fkVuo8rbHmem3GwJvQVL5wlEYDo3Yp0vpFPyKukOiTMpHwOk -yRxZFan1sGXD4LlAcIBbFYegz6y8lM/pXA1wS8Hn1YGOX6Rf8zzmlftRLMemQ+p1 -BV5mYw6xASvM4sbI5Z5vKNSkMkF61qs+VmpQpQIDAQABAoIBAHec/nN79A15wfHY -D3OO6y0wet6z3WAYABI3F/nA92czCL1IpHVqfErQ60VWzU/yX9WnG+qbrYKB/qSx -jdqxoDT01OAzyDqqB40VaiXy759uRl5UJQO1Qg3/+jJgmGbV2VFbavjTMouQ7oUk -lVqBAS1oFRuZpmRPImoHa+QMfsI4CRKwiv6oaoMt0FSaCdIxmW0qi1QDkl+aY7EO -zcodQW59eyt3wfHc6zjTzVpuirx74zbExsSaeiHCdOUHP4uhslI1mbLQ8+vbfg51 -0LtbYEW0BcAvd1IBZC7iJMHzMaiPRvEHIdlLQWRTWxTFPH3+E3iEzC5McTQg39K+ -+2cm5m0CgYEAy/oyZlzGCDAUzCRkPWpTpjqPlUWqCUMNvzfZxhyjj+t8w89R/g2J -dsZZlkklYUOiS5McFx55q245dxqd8aX6mvbaGIJTcx89v6i7Z35X8x83m3Xent5b -U9lYnfFsikMqX6e7PBPxPAlv46jBFnpGu13vnmLS0D5UJOzlpU8VHHcCgYEA3nZO -OySc1I0owXRTrdiPDdkJ3hOMd763aXGDYHc2j1Y1yRL4nuC4uCgVTzuEVNhgyAs9 -5IuPmcfORvuitoyWixpbuJWbrI2GqHGkCjKdf1ggZMP1BT//YvCZkpdlD5tjSehm -/Atzh2XtpWLVns0RVnfuOy25LCxdhMGuaGjZ7sMCgYEAhj54BR5xxtm+FkytHC5q -NzC7ZsaejdHvrjWXweb/TqzxQ/2iPM2z9tO8CkjBrS3SFmMPTbfk44p7j4OZB3zx -XiOwjgjX2yBoh0cJb6ebQor9EfeVOIGnIZwd0nUdtjFWJfZCJ9wIHDcpyG88BQsc -mhvMpDTuAdfDkTnIOe++OSkCgYBgHuQMf/RXjqqGdBnX6tNc22N9FhtCfiBHqilm -2/uyEUDqIY1VMKn/wCn88y1pb5jZtqnGf1rLyl5ho0aZ88L0Va494j7CXuBJFdkY -IuiUZmKQx26uFwnlGSpyAYJELRLIk2c0DkqbvTnilQLSO677GpTP8yCoan755qnS -KUPI+wKBgQCvXPrWF8Xdx8ibM4fi+dzXd3UU67ZegxlSf3upe3AdUL+VpoMwn6W3 -o4BgDjVnJO5QwXo4Aj/iRHrJ4OtUqAxcy0ecTm8ZyR41Asm6r6npGSsiSa9fT71j -g4/tjKvgDT5U/zv5z8xL9nXXAf6jhR7PylHoBFPw+H5INDe9OGM/Ag== ------END RSA PRIVATE KEY----- diff --git a/server.crt b/server.crt deleted file mode 100644 index fe4ec8509..000000000 --- a/server.crt +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/DCCAeSgAwIBAgIIGzvs3g62fLYwDQYJKoZIhvcNAQELBQAwDTELMAkGA1UE -AxMCY2EwHhcNMTgwODA5MTEyOTQyWhcNMTkwODA5MTEyOTQzWjARMQ8wDQYDVQQD -EwZzZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGz6Hp/o0B -3lloAEXBmU+fUT/iQQr+ylfteWm1+G+T6P7IpDs+yoSn2RHWggglx5VjXR/x7gE2 -VxT0Wr1mmtKXmrJkJ8vUTAaUw2mgNAKp7L9txtl80WKO2LDZ6bOKUGl9YEr2Y/aI -nCOzjRdcEQqUx2KifUCfm6qByGiXfbOUdhEKXUd/vVx/x7hnrS5TqE0rqUt+S45E -pGRXzXTASH88PVQKelrmrsrRnUwr99CxpHexu/C0dO7/9DGQc3vk4rlOLyKa9E7j -3cmfYqjUVLVq76ZRfJzFip5/+QgALSwxajsoil9SMRYGEn709RL8CBmzByKwRhhX -FDh2pLYcqPm5AgMBAAGjXDBaMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr -BgEFBQcDATAzBgNVHREELDAqgiJrdWJlZGItZXMtb3BlcmF0b3Iua3ViZS1zeXN0 -ZW0uc3ZjhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQBwWpA+5WxCAJwj1LbWLo1+ -dlSpOUtZ4GSw0Pg/Br+EmZ/lL+kHlTHoDXsPimoWp7FJaU19DqM/J5LJD/nghQby -Z2T24LCNLl2fXl1Gm+2L889wl3vTQLRh9MP7ur5+ieJmFio4bw0oeZPtyGwnhIm0 -tqKDcS0JoyZ0ZiITuinS9C/zyKDIPejZKnoyA/NPTOfe4M9QmFTAQxngItJyI1ow -OCU/PKJoL41PIzeVVMkjTItFLO1CC95vXTFkNQTgPRNIqKwWmkB6HeRUX/rfElPs -WndUqCRTjyshwMdHZcAo8MJkI64XLtKaiTr4mPdY7hT5eS3/z/unQZg3X/mNs8xM ------END CERTIFICATE----- diff --git a/server.key b/server.key deleted file mode 100644 index 645093e23..000000000 --- a/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxs+h6f6NAd5ZaABFwZlPn1E/4kEK/spX7Xlptfhvk+j+yKQ7 -PsqEp9kR1oIIJceVY10f8e4BNlcU9Fq9ZprSl5qyZCfL1EwGlMNpoDQCqey/bcbZ -fNFijtiw2emzilBpfWBK9mP2iJwjs40XXBEKlMdion1An5uqgchol32zlHYRCl1H -f71cf8e4Z60uU6hNK6lLfkuORKRkV810wEh/PD1UCnpa5q7K0Z1MK/fQsaR3sbvw -tHTu//QxkHN75OK5Ti8imvRO493Jn2Ko1FS1au+mUXycxYqef/kIAC0sMWo7KIpf -UjEWBhJ+9PUS/AgZswcisEYYVxQ4dqS2HKj5uQIDAQABAoIBAGYSDc/j56Mw8/gI -Q8gMnStvfHv95tY/Lnt2nUZWwXpP4hdC8kPfl9HRCW53HhW/bTwxgIgmKKssdE6s -E5eNH1fEjZgMMoLRcYOI/D7K1R9GtFV5BQonOhGawNlwOcRmWnKLMJFlaxpiB5ZU -dszG1wbhgwtngPkw4450RPaaC8vJFdOVPYx0BiG+m2haB0TtMu8EnGheYaqKnquN -zlp68oTRgpgQHrQ1Ht/BGoP5MQWog7RIL+VKfCEEIj2yEtGxqHjGivmAYy+Pw1B1 -qxT30zVOuXdayxhk6+CrZaQoOgEVrAtwvde9/zGcTou2Vaz/aZspZJzMSQIoGyR3 -LTvOgAECgYEA8yAYp6Dr3O/A0NTC8sl64e+zONJA3NfDfSiUVeinUj+jvjvmOO5p -XGI7c9W4AIY1kV7AXsbAPXZYuECz2otmBk3Stsyhoo2EPsCeo7pTRuoyW+dIoLHV -egEHxDaTHvLSi7zjRcPmecMfXwVjJ+BK2bli7mXjlvB1DPqzaKzDcAECgYEA0VbL -OUnhJPLBcE4KVdekg6nE6WtfNu46Emv1GCzXaI/zopeiBwSyc5wY0z0bEIm0cgQZ -fhb8c+nKcEgZhvsIYXODnSlNLqtvWV5Ch0Lmxy95fH4me+OfUdCMUGnKRce6l3QE -GF9ynaoZxEMSucnEAGcO0pMJyQu9DauJ0LR9CbkCgYEA8JpN6+5kHPSj88bq2syr -sFbAHbZtfGCG1SDIk7A3jjzutf+fWa4PVN7eCUdy3gnzj1aet+ynKOwq5sUZeGlF -4W0437DpMO4t9tA27r8hVOfGSI89n9H9+sx0PCjqNdGGrcWTgWJafxuruySguUDN -smQ11Mm+joyOufaMgEWg8AECgYAPPiamET8XlaWIK+aMwZr1C1OPO4Y/VbFczgeW -rw0wS+sNl8TwheMIkAEuwHBMD/rXonzItZvERO28p0NUlMrTbbnTo8I+97Sv6TEm -8DQlpMtPyU+8DaL4LhtJb6qO0jA//u6dZ7XMzSn7JHckmBBxhw+JPbOks/ocGLV8 -QOgp4QKBgB8qD/FAEH89DlzPzLD2JEUdqm412WLUvjCxx3ZoK9PH7R/UpyEVRqJC -xOGPLsBJt17G0S/wXK8Bc5MldsflyboRlTiKTLcERdZcfL+IIwHgO4bZe2nB53zd -wBVaB+NOk0RFY8pKnvnexeovfzdHgJXwfNGJuO8na9W3KLvXyK1c ------END RSA PRIVATE KEY----- From 6ec9e6c2016fe4dd37a84654efa9d09f22476041 Mon Sep 17 00:00:00 2001 From: the-redback Date: Tue, 14 Aug 2018 17:32:26 +0600 Subject: [PATCH 07/10] refactored kubedb-catalog installation --- .../templates/elasticsearch.yaml | 107 +++++++ chart/kubedb-catalog/templates/memcached.yaml | 35 +++ chart/kubedb-catalog/templates/mongodb.yaml | 35 +++ chart/kubedb-catalog/templates/mysql.yaml | 53 ++++ chart/kubedb-catalog/templates/redis.yaml | 53 ++++ hack/deploy/kubedb-catalog.yaml | 272 ------------------ hack/deploy/kubedb-catalog/elasticsearch.yaml | 89 ++++++ hack/deploy/kubedb-catalog/memcached.yaml | 25 ++ hack/deploy/kubedb-catalog/mongodb.yaml | 29 ++ hack/deploy/kubedb-catalog/mysql.yaml | 59 ++++ hack/deploy/kubedb-catalog/postgres.yaml | 44 +++ hack/deploy/kubedb-catalog/redis.yaml | 38 +++ hack/deploy/kubedb.sh | 37 ++- 13 files changed, 595 insertions(+), 281 deletions(-) create mode 100644 chart/kubedb-catalog/templates/elasticsearch.yaml create mode 100644 chart/kubedb-catalog/templates/memcached.yaml create mode 100644 chart/kubedb-catalog/templates/mongodb.yaml create mode 100644 chart/kubedb-catalog/templates/mysql.yaml create mode 100644 chart/kubedb-catalog/templates/redis.yaml delete mode 100644 hack/deploy/kubedb-catalog.yaml create mode 100644 hack/deploy/kubedb-catalog/elasticsearch.yaml create mode 100644 hack/deploy/kubedb-catalog/memcached.yaml create mode 100644 hack/deploy/kubedb-catalog/mongodb.yaml create mode 100644 hack/deploy/kubedb-catalog/mysql.yaml create mode 100644 hack/deploy/kubedb-catalog/postgres.yaml create mode 100644 hack/deploy/kubedb-catalog/redis.yaml diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml new file mode 100644 index 000000000..fee5a20fc --- /dev/null +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -0,0 +1,107 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6.4" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2.4" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3" diff --git a/chart/kubedb-catalog/templates/memcached.yaml b/chart/kubedb-catalog/templates/memcached.yaml new file mode 100644 index 000000000..b8fd0d297 --- /dev/null +++ b/chart/kubedb-catalog/templates/memcached.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/memcached:1.5" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/memcached-tools:1.5" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5.4" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/memcached-tools:1.5.4" diff --git a/chart/kubedb-catalog/templates/mongodb.yaml b/chart/kubedb-catalog/templates/mongodb.yaml new file mode 100644 index 000000000..38bc0979d --- /dev/null +++ b/chart/kubedb-catalog/templates/mongodb.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.4" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/mongo:3.4" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.6" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/mongo:3.6" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6" diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml new file mode 100644 index 000000000..28957e8a5 --- /dev/null +++ b/chart/kubedb-catalog/templates/mysql.yaml @@ -0,0 +1,53 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/mysql:8.0" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5.7" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/mysql:5.7" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/mysql:5" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:5" diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml new file mode 100644 index 000000000..939918636 --- /dev/null +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -0,0 +1,53 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0.6" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/redis:4.0.6" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/redis-tools:4.0.6" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/redis:4.0" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/redis-tools:4.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + db: + image: "{{ .Values.dockerRegistry }}/redis:4" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + tools: + image: "{{ .Values.dockerRegistry }}/redis-tools:4" diff --git a/hack/deploy/kubedb-catalog.yaml b/hack/deploy/kubedb-catalog.yaml deleted file mode 100644 index c2b9dfc0b..000000000 --- a/hack/deploy/kubedb-catalog.yaml +++ /dev/null @@ -1,272 +0,0 @@ ---- -apiVersion: kubedb.com/v1alpha1 -kind: PostgresVersion -metadata: - name: "9.6" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6" - ---- -apiVersion: kubedb.com/v1alpha1 -kind: PostgresVersion -metadata: - name: "9.6.7" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7" - ---- -apiVersion: kubedb.com/v1alpha1 -kind: PostgresVersion -metadata: - name: "10.2" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "5.6" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "5.6.4" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "6.2" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "6.2.4" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "6.3.0" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "6.3" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MongoDBVersion -metadata: - name: "3.4" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MongoDBVersion -metadata: - name: "3.6" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MySQLVersion -metadata: - name: "8.0" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MySQLVersion -metadata: - name: "8" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MySQLVersion -metadata: - name: "5.7" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MySQLVersion -metadata: - name: "5" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MemcachedVersion -metadata: - name: "1.5" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: MemcachedVersion -metadata: - name: "1.5.4" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: RedisVersion -metadata: - name: "4.0.6" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: RedisVersion -metadata: - name: "4.0" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" ---- -apiVersion: kubedb.com/v1alpha1 -kind: RedisVersion -metadata: - name: "4" - labels: - app: kubedb -spec: - db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml new file mode 100644 index 000000000..0e8b11bc8 --- /dev/null +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -0,0 +1,89 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" diff --git a/hack/deploy/kubedb-catalog/memcached.yaml b/hack/deploy/kubedb-catalog/memcached.yaml new file mode 100644 index 000000000..9fec2e43f --- /dev/null +++ b/hack/deploy/kubedb-catalog/memcached.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" diff --git a/hack/deploy/kubedb-catalog/mongodb.yaml b/hack/deploy/kubedb-catalog/mongodb.yaml new file mode 100644 index 000000000..226f2e85b --- /dev/null +++ b/hack/deploy/kubedb-catalog/mongodb.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" diff --git a/hack/deploy/kubedb-catalog/mysql.yaml b/hack/deploy/kubedb-catalog/mysql.yaml new file mode 100644 index 000000000..d1a4e38ec --- /dev/null +++ b/hack/deploy/kubedb-catalog/mysql.yaml @@ -0,0 +1,59 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5.7" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" diff --git a/hack/deploy/kubedb-catalog/postgres.yaml b/hack/deploy/kubedb-catalog/postgres.yaml new file mode 100644 index 000000000..e8d315f08 --- /dev/null +++ b/hack/deploy/kubedb-catalog/postgres.yaml @@ -0,0 +1,44 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6.7" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "10.2" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2" diff --git a/hack/deploy/kubedb-catalog/redis.yaml b/hack/deploy/kubedb-catalog/redis.yaml new file mode 100644 index 000000000..213308689 --- /dev/null +++ b/hack/deploy/kubedb-catalog/redis.yaml @@ -0,0 +1,38 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0.6" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4" + labels: + app: kubedb +spec: + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index 46e9b9063..09261d274 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -115,7 +115,7 @@ export KUBEDB_ENABLE_RBAC=true export KUBEDB_RUN_ON_MASTER=0 export KUBEDB_ENABLE_VALIDATING_WEBHOOK=false export KUBEDB_ENABLE_MUTATING_WEBHOOK=false -export KUBEDB_ENABLE_CATALOG=true +export KUBEDB_ENABLE_CATALOG=${KUBEDB_ENABLE_CATALOG:-all} export KUBEDB_DOCKER_REGISTRY=kubedb export KUBEDB_OPERATOR_TAG=0.8.0 export KUBEDB_OPERATOR_NAME=operator @@ -408,14 +408,33 @@ if [ "$KUBEDB_OPERATOR_NAME" = "operator" ]; then done fi -if [ "$KUBEDB_OPERATOR_NAME" != "operator" ]; then - set +e -fi - -if [ "$KUBEDB_ENABLE_CATALOG" = true ]; then - echo "adding kubedb catalog" - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog.yaml | $ONESSL envsubst | kubectl apply -f - -fi +echo "adding kubedb catalog" +case "$KUBEDB_ENABLE_CATALOG" in + all) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/* | $ONESSL envsubst | kubectl apply -f - + ;; + elasticsearch) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/elasticsearch.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + postgres) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/postgres.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + mongodb) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mongodb.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + mysql) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mysql.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + redis) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/redis.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + memcached) + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/memcached.yaml | $ONESSL envsubst | kubectl apply -f - + ;; + *) + ;; + +esac echo echo "Successfully installed KubeDB operator in $KUBEDB_NAMESPACE namespace!" From 9703f3443ff2f6528f570445baf9749ec2a842aa Mon Sep 17 00:00:00 2001 From: the-redback Date: Tue, 14 Aug 2018 17:34:49 +0600 Subject: [PATCH 08/10] added-all --- chart/kubedb-catalog/templates/memcached.yaml | 4 ---- chart/kubedb-catalog/templates/redis.yaml | 6 ------ 2 files changed, 10 deletions(-) diff --git a/chart/kubedb-catalog/templates/memcached.yaml b/chart/kubedb-catalog/templates/memcached.yaml index b8fd0d297..14dddf20e 100644 --- a/chart/kubedb-catalog/templates/memcached.yaml +++ b/chart/kubedb-catalog/templates/memcached.yaml @@ -13,8 +13,6 @@ spec: image: "{{ .Values.dockerRegistry }}/memcached:1.5" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" - tools: - image: "{{ .Values.dockerRegistry }}/memcached-tools:1.5" --- apiVersion: kubedb.com/v1alpha1 @@ -31,5 +29,3 @@ spec: image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" - tools: - image: "{{ .Values.dockerRegistry }}/memcached-tools:1.5.4" diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml index 939918636..df6a029b3 100644 --- a/chart/kubedb-catalog/templates/redis.yaml +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -13,8 +13,6 @@ spec: image: "{{ .Values.dockerRegistry }}/redis:4.0.6" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" - tools: - image: "{{ .Values.dockerRegistry }}/redis-tools:4.0.6" --- apiVersion: kubedb.com/v1alpha1 @@ -31,8 +29,6 @@ spec: image: "{{ .Values.dockerRegistry }}/redis:4.0" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" - tools: - image: "{{ .Values.dockerRegistry }}/redis-tools:4.0" --- apiVersion: kubedb.com/v1alpha1 @@ -49,5 +45,3 @@ spec: image: "{{ .Values.dockerRegistry }}/redis:4" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" - tools: - image: "{{ .Values.dockerRegistry }}/redis-tools:4" From 7dc8cd8ecd3d764e670d9cbe138f36538ebb8ae7 Mon Sep 17 00:00:00 2001 From: the-redback Date: Tue, 14 Aug 2018 17:38:41 +0600 Subject: [PATCH 09/10] added-all --- hack/deploy/kubedb.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index 09261d274..291802b4c 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -433,7 +433,6 @@ case "$KUBEDB_ENABLE_CATALOG" in ;; *) ;; - esac echo From 038180087c7599187e498478f2a709c10bcbdf4e Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Tue, 14 Aug 2018 11:57:10 -0700 Subject: [PATCH 10/10] Fix catalog installer --- .../templates/elasticsearch.yaml | 2 + chart/kubedb-catalog/templates/memcached.yaml | 2 + chart/kubedb-catalog/templates/mongodb.yaml | 2 + chart/kubedb-catalog/templates/mysql.yaml | 2 + chart/kubedb-catalog/templates/postgres.yaml | 2 + chart/kubedb-catalog/templates/redis.yaml | 2 + chart/kubedb-catalog/values.yaml | 8 +++ docs/setup/install.md | 8 +-- hack/deploy/kubedb.sh | 67 ++++++++++--------- 9 files changed, 59 insertions(+), 36 deletions(-) diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml index fee5a20fc..1a06f309d 100644 --- a/chart/kubedb-catalog/templates/elasticsearch.yaml +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.elasticsearch }} --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -105,3 +106,4 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3" +{{ end }} diff --git a/chart/kubedb-catalog/templates/memcached.yaml b/chart/kubedb-catalog/templates/memcached.yaml index 14dddf20e..abbeffc1a 100644 --- a/chart/kubedb-catalog/templates/memcached.yaml +++ b/chart/kubedb-catalog/templates/memcached.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.memcached }} --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion @@ -29,3 +30,4 @@ spec: image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" +{{ end }} diff --git a/chart/kubedb-catalog/templates/mongodb.yaml b/chart/kubedb-catalog/templates/mongodb.yaml index 38bc0979d..3cf0ade17 100644 --- a/chart/kubedb-catalog/templates/mongodb.yaml +++ b/chart/kubedb-catalog/templates/mongodb.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.mongo }} --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion @@ -33,3 +34,4 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6" +{{ end }} diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml index 28957e8a5..790429d2c 100644 --- a/chart/kubedb-catalog/templates/mysql.yaml +++ b/chart/kubedb-catalog/templates/mysql.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.mysql }} --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -51,3 +52,4 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mysql-tools:5" +{{ end }} diff --git a/chart/kubedb-catalog/templates/postgres.yaml b/chart/kubedb-catalog/templates/postgres.yaml index c4ad1f64c..3221a3c3c 100644 --- a/chart/kubedb-catalog/templates/postgres.yaml +++ b/chart/kubedb-catalog/templates/postgres.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.postgres }} --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -51,3 +52,4 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2" +{{ end }} diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml index df6a029b3..5a749f824 100644 --- a/chart/kubedb-catalog/templates/redis.yaml +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -1,3 +1,4 @@ +{{ if .Values.catalog.redis }} --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion @@ -45,3 +46,4 @@ spec: image: "{{ .Values.dockerRegistry }}/redis:4" exporter: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" +{{ end }} diff --git a/chart/kubedb-catalog/values.yaml b/chart/kubedb-catalog/values.yaml index 3a0ed6276..f3d10e057 100644 --- a/chart/kubedb-catalog/values.yaml +++ b/chart/kubedb-catalog/values.yaml @@ -1 +1,9 @@ dockerRegistry: "kubedb" +catalog: + elasticsearch: true + etcd: true + memcached: true + mongo: true + mysql: true + postgres: true + redis: true diff --git a/docs/setup/install.md b/docs/setup/install.md index 0e45f8205..fd01cda89 100644 --- a/docs/setup/install.md +++ b/docs/setup/install.md @@ -66,9 +66,9 @@ options: --run-on-master run KubeDB operator on master --enable-validating-webhook enable/disable validating webhooks for KubeDB CRDs --enable-mutating-webhook enable/disable mutating webhooks for KubeDB CRDs - --enable-status-subresource If enabled, uses status sub resource for crds + --enable-status-subresource if enabled, uses status sub resource for crds --enable-analytics send usage events to Google Analytics (default: true) - --enable-catalog If enabled, installs kubedb database version catalog (default: true) + --install-catalog installs KubeDB database version catalog (default: all) --uninstall uninstall KubeDB --purge purges KubeDB crd objects and crds ``` @@ -107,11 +107,11 @@ $ curl -fsSL https://raw.githubusercontent.com/kubedb/cli/0.8.0/hack/deploy/kube KubeDB 0.9.0 or later releases can use status sub resource for CustomResourceDefintions. This is enabled by default for Kubernetes 1.11.0 or later releases. To disable this feature, pass the `--enable-status-subresource=false` flag. -KubeDB 0.9.0 or later installs a catalog of database versions. To disable this pass the `--enable-catalog=false` flag. +KubeDB 0.9.0 or later installs a catalog of database versions. To disable this pass the `--install-catalog=none` flag. ```console $ curl -fsSL https://raw.githubusercontent.com/kubedb/cli/0.8.0/hack/deploy/kubedb.sh \ - | bash -s -- --enable-catalog=false [--rbac] + | bash -s -- --install-catalog=none [--rbac] ``` diff --git a/hack/deploy/kubedb.sh b/hack/deploy/kubedb.sh index 291802b4c..0dde867ac 100755 --- a/hack/deploy/kubedb.sh +++ b/hack/deploy/kubedb.sh @@ -115,7 +115,7 @@ export KUBEDB_ENABLE_RBAC=true export KUBEDB_RUN_ON_MASTER=0 export KUBEDB_ENABLE_VALIDATING_WEBHOOK=false export KUBEDB_ENABLE_MUTATING_WEBHOOK=false -export KUBEDB_ENABLE_CATALOG=${KUBEDB_ENABLE_CATALOG:-all} +export KUBEDB_CATALOG=${KUBEDB_CATALOG:-all} export KUBEDB_DOCKER_REGISTRY=kubedb export KUBEDB_OPERATOR_TAG=0.8.0 export KUBEDB_OPERATOR_NAME=operator @@ -160,10 +160,10 @@ show_help() { echo " --run-on-master run KubeDB operator on master" echo " --enable-validating-webhook enable/disable validating webhooks for KubeDB CRDs" echo " --enable-mutating-webhook enable/disable mutating webhooks for KubeDB CRDs" - echo " --enable-status-subresource If enabled, uses status sub resource for KubeDB crds" + echo " --enable-status-subresource if enabled, uses status sub resource for KubeDB crds" echo " --enable-analytics send usage events to Google Analytics (default: true)" - echo " --enable-catalog If enabled, installs kubedb database version catalog (default: true)" - echo " --operator-name specify which kubedb operator to deploy (default: operator)" + echo " --install-catalog installs KubeDB database version catalog (default: all)" + echo " --operator-name specify which KubeDB operator to deploy (default: operator)" echo " --uninstall uninstall KubeDB" echo " --purge purges KubeDB crd objects and crds" } @@ -225,11 +225,11 @@ while test $# -gt 0; do fi shift ;; - --enable-catalog*) + --install-catalog*) shift val=$(echo $1 | sed -e 's/^[^=]*=//g') if [ "$val" = "false" ]; then - export KUBEDB_ENABLE_CATALOG=false + export KUBEDB_CATALOG=false fi ;; --rbac*) @@ -408,32 +408,35 @@ if [ "$KUBEDB_OPERATOR_NAME" = "operator" ]; then done fi -echo "adding kubedb catalog" -case "$KUBEDB_ENABLE_CATALOG" in - all) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/* | $ONESSL envsubst | kubectl apply -f - - ;; - elasticsearch) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/elasticsearch.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - postgres) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/postgres.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - mongodb) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mongodb.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - mysql) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mysql.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - redis) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/redis.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - memcached) - ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/memcached.yaml | $ONESSL envsubst | kubectl apply -f - - ;; - *) - ;; -esac +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "elasticsearch" ]; then + echo "installing KubeDB Elasticsearch catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/elasticsearch.yaml | $ONESSL envsubst | kubectl apply -f - +fi + +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "postgres" ]; then + echo "installing KubeDB Postgres catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/postgres.yaml | $ONESSL envsubst | kubectl apply -f - +fi + +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "mongo" ]; then + echo "installing KubeDB MongoDB catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mongodb.yaml | $ONESSL envsubst | kubectl apply -f - +fi + +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "mysql" ]; then + echo "installing KubeDB MySQL catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/mysql.yaml | $ONESSL envsubst | kubectl apply -f - +fi + +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "redis" ]; then + echo "installing KubeDB Redis catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/redis.yaml | $ONESSL envsubst | kubectl apply -f - +fi + +if [ "KUBEDB_CATALOG" = "all" ] || [ "KUBEDB_CATALOG" = "memcached" ]; then + echo "installing KubeDB Memcached catalog" + ${SCRIPT_LOCATION}hack/deploy/kubedb-catalog/memcached.yaml | $ONESSL envsubst | kubectl apply -f - +fi echo echo "Successfully installed KubeDB operator in $KUBEDB_NAMESPACE namespace!"