Skip to content

Commit

Permalink
pr pipeline test (#7)
Browse files Browse the repository at this point in the history
set elasticsearch replicas to 1
  • Loading branch information
monotek authored Dec 31, 2018
1 parent 27542fc commit 458e3f0
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .circleci/ct.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
charts: zammad
chart-dirs: zammad
helm-extra-args: --timeout 3600 --debug
helm-extra-args: --timeout 3600
check-version-increment: true
3 changes: 1 addition & 2 deletions .circleci/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/bin/bash
#
# build zammad chart and upload to zammad.github.io
# deploy zammad chart to zammad.github.io
#

set -o errexit
set -o pipefail
set -o xtrace

CHART_DIR="zammad"
CHART_REPO="[email protected]:zammad/zammad.github.io.git"
Expand Down
5 changes: 2 additions & 3 deletions .circleci/install.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/usr/bin/env bash
#
# ci with chart-testing & kind
# install zammad in kubernetes kind
#

set -o errexit
set -o pipefail
set -o xtrace

KIND_DOCKER_NAME="kind-1-control-plane"
KUBERNETES_VERSIONS=('v1.11.3' 'v1.12.3')
Expand Down Expand Up @@ -107,5 +106,5 @@ if [ "${CIRCLECI}" == 'true' ] && [ -n "${CIRCLE_PULL_REQUEST}" ]; then
main
done
else
echo "skipped install as its no pull request"
echo "skipped chart install as its not a pull request..."
fi
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# Helm chart to install Zammad in Kubernetes
# Helm chart to install Zammad on Kubernetes
2 changes: 1 addition & 1 deletion zammad/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: zammad
version: 0.1.0
version: 0.1.2
appVersion: 2.8.0
description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
home: https://zammad.org
Expand Down
37 changes: 19 additions & 18 deletions zammad/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ingress:
hosts:
- chart-example.local
tls: []
# - secretName: chart-example-tls
# - secretName: zammad-tls
# hosts:
# - chart-example.local

Expand Down Expand Up @@ -108,56 +108,57 @@ elasticsearch:
cluster:
xpackEnable: false
env:
MINIMUM_MASTER_NODES: "2"
MINIMUM_MASTER_NODES: "1"
XPACK_MONITORING_ENABLED: false
client:
replicas: 2
replicas: 1
# resources:
# requests:
# cpu: "25m"
# memory: "512Mi"
# limits:
# cpu: "300m"
# memory: "1024Mi"
# requests:
# cpu: "25m"
# memory: "768Mi"
data:
terminationGracePeriodSeconds: 60
replicas: 2
replicas: 1
# resources:
# limits:
# cpu: "350m"
# memory: "2048Mi"
# requests:
# cpu: "175m"
# memory: "1536Mi"
# limits:
# cpu: "350m"
# memory: "2048Mi"
master:
replicas: 2
replicas: 1
# resources:
# limits:
# cpu: "300m"
# memory: "1024Mi"
# requests:
# cpu: "25m"
# memory: "512Mi"
# limits:
# cpu: "300m"
# memory: "1024Mi"


memcached:
replicaCount: 1
# resources:
# requests:
# memory: 64Mi
# cpu: 50m
# memory: 64Mi
# limits:
# memory: 128Mi
# cpu: 100m
# memory: 128Mi


postgresql:
postgresqlUsername: zammad
postgresqlPassword: zammad
postgresqlDatabase: zammad_production
# resources:
# requests:
# memory: 256Mi
# cpu: 250m
# memory: 256Mi
# limits:
# memory: 512Mi
# cpu: 500m
# memory: 512Mi

0 comments on commit 458e3f0

Please sign in to comment.