From 628028798052fa06ea3f78f267e24c1924be0db9 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 11 Jul 2016 15:41:22 +0530 Subject: [PATCH] migrated rabbitmq chart --- rabbitmq/.helmignore | 0 rabbitmq/Chart.yaml | 18 +++-- rabbitmq/manifests/rabbitmq-secrets.yaml | 12 ---- .../{manifests => templates}/rabbitmq-rc.yaml | 30 ++++---- rabbitmq/templates/rabbitmq-secrets.yaml | 12 ++++ .../rabbitmq-svc.yaml | 4 +- rabbitmq/tpl/rabbitmq-rc.yaml | 71 ------------------- rabbitmq/tpl/rabbitmq-secrets.yaml | 12 ---- rabbitmq/tpl/values.toml | 9 --- rabbitmq/values.yaml | 10 +++ 10 files changed, 52 insertions(+), 126 deletions(-) create mode 100644 rabbitmq/.helmignore delete mode 100644 rabbitmq/manifests/rabbitmq-secrets.yaml rename rabbitmq/{manifests => templates}/rabbitmq-rc.yaml (61%) create mode 100644 rabbitmq/templates/rabbitmq-secrets.yaml rename rabbitmq/{manifests => templates}/rabbitmq-svc.yaml (63%) delete mode 100644 rabbitmq/tpl/rabbitmq-rc.yaml delete mode 100644 rabbitmq/tpl/rabbitmq-secrets.yaml delete mode 100644 rabbitmq/tpl/values.toml create mode 100644 rabbitmq/values.yaml diff --git a/rabbitmq/.helmignore b/rabbitmq/.helmignore new file mode 100644 index 000000000..e69de29bb diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index 2f5b41638..824e1086f 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -1,10 +1,14 @@ name: rabbitmq -home: https://www.rabbitmq.com -source: -- https://github.com/bitnami/bitnami-docker-rabbitmq -version: 0.2.1 +version: 0.3.0 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) +keywords: +- rabbitmq +- message queue +- AMQP +home: https://www.rabbitmq.com +sources: +- https://github.com/bitnami/bitnami-docker-rabbitmq maintainers: -- Bitnami -details: |- - RabbitMQ is an open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). +- name: Bitnami + email: containers@bitnami.com +engine: gotpl diff --git a/rabbitmq/manifests/rabbitmq-secrets.yaml b/rabbitmq/manifests/rabbitmq-secrets.yaml deleted file mode 100644 index 86e6f78ac..000000000 --- a/rabbitmq/manifests/rabbitmq-secrets.yaml +++ /dev/null @@ -1,12 +0,0 @@ -#helm:generate helmc tpl -d tpl/values.toml -o manifests/rabbitmq-secrets.yaml $HELM_GENERATE_FILE -apiVersion: v1 -kind: Secret -metadata: - name: rabbitmq - labels: - provider: rabbitmq - heritage: bitnami -type: Opaque -data: - rabbitmq-password: "Yml0bmFtaQ==" - rabbitmq-erlangcookie: "" diff --git a/rabbitmq/manifests/rabbitmq-rc.yaml b/rabbitmq/templates/rabbitmq-rc.yaml similarity index 61% rename from rabbitmq/manifests/rabbitmq-rc.yaml rename to rabbitmq/templates/rabbitmq-rc.yaml index 4a35ed1df..af329b428 100644 --- a/rabbitmq/manifests/rabbitmq-rc.yaml +++ b/rabbitmq/templates/rabbitmq-rc.yaml @@ -1,51 +1,53 @@ -#helm:generate helmc tpl -d tpl/values.toml -o manifests/rabbitmq-rc.yaml $HELM_GENERATE_FILE apiVersion: v1 kind: ReplicationController metadata: - name: rabbitmq + name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} labels: provider: rabbitmq + release: {{ .Release.Name }} heritage: bitnami spec: replicas: 1 selector: provider: rabbitmq - version: 3.6.2-r0 + release: {{ .Release.Name }} + version: {{ .Values.imageTag }} template: metadata: labels: provider: rabbitmq - version: 3.6.2-r0 + release: {{ .Release.Name }} + version: {{ .Values.imageTag }} heritage: bitnami spec: containers: - name: rabbitmq - image: bitnami/rabbitmq:3.6.2-r0 + image: bitnami/rabbitmq:{{ .Values.imageTag }} env: - name: RABBITMQ_USERNAME - value: "user" + value: {{ .Values.rabbitmqUsername | quote }} - name: RABBITMQ_PASSWORD valueFrom: secretKeyRef: - name: rabbitmq + name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} key: rabbitmq-password - name: RABBITMQ_ERLANGCOOKIE valueFrom: secretKeyRef: - name: rabbitmq + name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} key: rabbitmq-erlangcookie - name: RABBITMQ_NODEPORT - value: "5672" + value: {{ .Values.rabbitmqNodeport | quote }} - name: RABBITMQ_NODETYPE - value: "stats" + value: {{ .Values.rabbitmqNodetype | quote }} - name: RABBITMQ_NODENAME - value: "rabbit" + value: {{ .Values.rabbitmqNodename | quote }} - name: RABBITMQ_CLUSTERNODENAME - value: "" + value: {{ .Values.rabbitmqClusternodename | quote }} - name: RABBITMQ_VHOST - value: "/" + value: {{ .Values.rabbitmqVhost | quote }} - name: RABBITMQ_MANAGERBINDIP - value: "0.0.0.0" + value: {{ .Values.rabbitmqManagerbindip | quote }} ports: - name: rabbitmq containerPort: 15672 diff --git a/rabbitmq/templates/rabbitmq-secrets.yaml b/rabbitmq/templates/rabbitmq-secrets.yaml new file mode 100644 index 000000000..335462e13 --- /dev/null +++ b/rabbitmq/templates/rabbitmq-secrets.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} + labels: + provider: rabbitmq + release: {{ .Release.Name }} + heritage: bitnami +type: Opaque +data: + rabbitmq-password: {{ default "" .Values.rabbitmqPassword | b64enc | quote }} + rabbitmq-erlangcookie: {{ default "" .Values.rabbitmqErlangcookie | b64enc | quote }} diff --git a/rabbitmq/manifests/rabbitmq-svc.yaml b/rabbitmq/templates/rabbitmq-svc.yaml similarity index 63% rename from rabbitmq/manifests/rabbitmq-svc.yaml rename to rabbitmq/templates/rabbitmq-svc.yaml index 63110f8e4..ccf8fb01b 100644 --- a/rabbitmq/manifests/rabbitmq-svc.yaml +++ b/rabbitmq/templates/rabbitmq-svc.yaml @@ -1,9 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: rabbitmq + name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} labels: provider: rabbitmq + release: {{ .Release.Name }} heritage: bitnami spec: type: LoadBalancer @@ -13,3 +14,4 @@ spec: targetPort: rabbitmq selector: provider: rabbitmq + release: {{ .Release.Name }} diff --git a/rabbitmq/tpl/rabbitmq-rc.yaml b/rabbitmq/tpl/rabbitmq-rc.yaml deleted file mode 100644 index a92fb6dbb..000000000 --- a/rabbitmq/tpl/rabbitmq-rc.yaml +++ /dev/null @@ -1,71 +0,0 @@ -#helm:generate helmc tpl -d tpl/values.toml -o manifests/rabbitmq-rc.yaml $HELM_GENERATE_FILE -apiVersion: v1 -kind: ReplicationController -metadata: - name: rabbitmq - labels: - provider: rabbitmq - heritage: bitnami -spec: - replicas: 1 - selector: - provider: rabbitmq - version: 3.6.2-r0 - template: - metadata: - labels: - provider: rabbitmq - version: 3.6.2-r0 - heritage: bitnami - spec: - containers: - - name: rabbitmq - image: bitnami/rabbitmq:3.6.2-r0 - env: - - name: RABBITMQ_USERNAME - value: {{ .rabbitmqUsername | quote }} - - name: RABBITMQ_PASSWORD - valueFrom: - secretKeyRef: - name: rabbitmq - key: rabbitmq-password - - name: RABBITMQ_ERLANGCOOKIE - valueFrom: - secretKeyRef: - name: rabbitmq - key: rabbitmq-erlangcookie - - name: RABBITMQ_NODEPORT - value: {{ .rabbitmqNodeport | quote }} - - name: RABBITMQ_NODETYPE - value: {{ .rabbitmqNodetype | quote }} - - name: RABBITMQ_NODENAME - value: {{ .rabbitmqNodename | quote }} - - name: RABBITMQ_CLUSTERNODENAME - value: {{ .rabbitmqClusternodename | quote }} - - name: RABBITMQ_VHOST - value: {{ .rabbitmqVhost | quote }} - - name: RABBITMQ_MANAGERBINDIP - value: {{ .rabbitmqManagerbindip | quote }} - ports: - - name: rabbitmq - containerPort: 15672 - livenessProbe: - exec: - command: - - rabbitmqctl - - status - initialDelaySeconds: 30 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - rabbitmqctl - - status - initialDelaySeconds: 5 - timeoutSeconds: 1 - volumeMounts: - - name: rabbitmq-data - mountPath: /bitnami/rabbitmq - volumes: - - name: rabbitmq-data - emptyDir: {} diff --git a/rabbitmq/tpl/rabbitmq-secrets.yaml b/rabbitmq/tpl/rabbitmq-secrets.yaml deleted file mode 100644 index ffcde572c..000000000 --- a/rabbitmq/tpl/rabbitmq-secrets.yaml +++ /dev/null @@ -1,12 +0,0 @@ -#helm:generate helmc tpl -d tpl/values.toml -o manifests/rabbitmq-secrets.yaml $HELM_GENERATE_FILE -apiVersion: v1 -kind: Secret -metadata: - name: rabbitmq - labels: - provider: rabbitmq - heritage: bitnami -type: Opaque -data: - rabbitmq-password: {{ .rabbitmqPassword | b64enc | quote }} - rabbitmq-erlangcookie: {{ .rabbitmqErlangcookie | b64enc | quote }} diff --git a/rabbitmq/tpl/values.toml b/rabbitmq/tpl/values.toml deleted file mode 100644 index 6ad50c2b9..000000000 --- a/rabbitmq/tpl/values.toml +++ /dev/null @@ -1,9 +0,0 @@ -rabbitmqUsername = "user" -rabbitmqPassword = "bitnami" -rabbitmqErlangcookie = "" -rabbitmqNodeport = "5672" -rabbitmqNodetype = "stats" -rabbitmqNodename = "rabbit" -rabbitmqClusternodename = "" -rabbitmqVhost = "/" -rabbitmqManagerbindip = "0.0.0.0" diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml new file mode 100644 index 000000000..9b954c654 --- /dev/null +++ b/rabbitmq/values.yaml @@ -0,0 +1,10 @@ +imageTag: 3.6.2-r0 +rabbitmqUsername: user +rabbitmqPassword: bitnami +rabbitmqErlangcookie: +rabbitmqNodeport: 5672 +rabbitmqNodetype: stats +rabbitmqNodename: rabbit +rabbitmqClusternodename: +rabbitmqVhost: / +rabbitmqManagerbindip: 0.0.0.0