diff --git a/README.md b/README.md index 29f46d9..c6f6ddb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ These manifests will allow you to deploy a fully formed Aerospike cluster in min It uses: - [aerospike-server docker image](https://hub.docker.com/r/aerospike/aerospike-server) -- [aerospike-tools docker image](https://hub.docker.com/r/aerospike/aerospike-tools) +- [aerospike-kubernetes-init docker image](https://hub.docker.com/r/aerospike/aerospike-kubernetes-init) ## Usage: diff --git a/configs/install.sh b/configs/install.sh deleted file mode 100755 index 079da45..0000000 --- a/configs/install.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/bash - -# ------------------------------------------------------------------------------ -# Copyright 2012-2019 Aerospike, Inc. -# -# Portions may be licensed to Aerospike, Inc. under one or more contributor -# license agreements. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# 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. -# ------------------------------------------------------------------------------ - - -CONFIG_VOLUME="/etc/aerospike" -NAMESPACE=${POD_NAMESPACE:-default} -K8_SERVICE=${SERVICE:-aerospike} -for i in "$@" -do -case $i in - -c=*|--config=*) - CONFIG_VOLUME="${i#*=}" - shift - ;; - *) - # unknown option - ;; -esac -done - -echo installing aerospike.conf into "${CONFIG_VOLUME}" -mkdir -p "${CONFIG_VOLUME}" -#chown -R aerospike:aerospike "${CONFIG_VOLUME}" -apt-get update && apt-get install -y wget -wget https://github.com/aerospike/aerospike-kubernetes/raw/master/docs/peer-finder -O /peer-finder -cp /configs/on-start.sh /on-start.sh -cp /configs/aerospike.template.conf "${CONFIG_VOLUME}"/ -chmod +x /on-start.sh -chmod +x /peer-finder -/peer-finder -on-start=/on-start.sh -service=$K8_SERVICE -ns=${NAMESPACE} -domain=cluster.local diff --git a/configs/on-start.sh b/configs/on-start.sh deleted file mode 100755 index 913ea52..0000000 --- a/configs/on-start.sh +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/bash -# ------------------------------------------------------------------------------ -# Copyright 2012-2019 Aerospike, Inc. -# -# Portions may be licensed to Aerospike, Inc. under one or more contributor -# license agreements. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# 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. -# ------------------------------------------------------------------------------ - -# This script writes out an aerospike config using a list of newline seperated -# peer DNS names it accepts through stdin. - -# /etc/aerospike is assumed to be a shared volume so we can modify aerospike.conf as required - - -set -e -set -x -CFG=/etc/aerospike/aerospike.template.conf - -function join { - local IFS="$1"; shift; echo "$*"; -} - -HOSTNAME=$(hostname) -# Parse out cluster name, formatted as: petset_name-index -IFS='-' read -ra ADDR <<< "$(hostname)" -CLUSTER_NAME="${ADDR[0]}" - -while read -ra LINE; do - if [[ "${LINE}" == *"${HOSTNAME}"* ]]; then - MY_NAME=$LINE - fi - PEERS=("${PEERS[@]}" $LINE) -done - -for PEER in "${PEERS[@]}"; do - sed -i -e "/mesh-seed-placeholder/a \\\t\tmesh-seed-address-port ${PEER} 3002" ${CFG} -done - - -# don't need a restart, we're just writing the conf in case there's an -# unexpected restart on the node. diff --git a/docs/aerospike-4.6.0.tgz b/docs/aerospike-4.6.0.tgz index 5824259..c99e540 100644 Binary files a/docs/aerospike-4.6.0.tgz and b/docs/aerospike-4.6.0.tgz differ diff --git a/docs/aerospike-4.7.0.tgz b/docs/aerospike-4.7.0.tgz index 6239a35..167ec42 100644 Binary files a/docs/aerospike-4.7.0.tgz and b/docs/aerospike-4.7.0.tgz differ diff --git a/docs/aerospike-4.8.0.tgz b/docs/aerospike-4.8.0.tgz index f9cfc04..1c1f8ed 100644 Binary files a/docs/aerospike-4.8.0.tgz and b/docs/aerospike-4.8.0.tgz differ diff --git a/docs/index.yaml b/docs/index.yaml index dbc5da4..5369747 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -2,10 +2,10 @@ apiVersion: v1 entries: aerospike: - apiVersion: v1 - appVersion: 4.8.0.5 - created: "2020-03-07T03:47:41.057394+05:30" + appVersion: 4.8.0.6 + created: "2020-03-16T23:01:17.608415+05:30" description: A Helm chart for Aerospike Server Community Edition on Kubernetes - digest: 916e89ec2a85d6c7ad5b69f8dfaf2a2d55a3e41f5de02299a05a6592dabd40ab + digest: 00677c21b1d63b88cc3f1044729a94f8c6780f20f648b3d19c7c628cf646d40e icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 maintainers: - email: kesan@aerospike.com @@ -20,10 +20,10 @@ entries: - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.8.0.tgz version: 4.8.0 - apiVersion: v1 - appVersion: 4.7.0.10 - created: "2020-03-07T03:47:41.055905+05:30" + appVersion: 4.7.0.11 + created: "2020-03-16T23:01:17.607033+05:30" description: A Helm chart for Aerospike Server Community Edition on Kubernetes - digest: 78fba0cc7280436181de267231b23962bd4b5561e9263bcaf7b7d5f8047dbe2a + digest: 2604162d62b08af86d9996abba19b88d1d794a93052af61d17fbbb4a74525bdb icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 maintainers: - email: kesan@aerospike.com @@ -38,10 +38,10 @@ entries: - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.7.0.tgz version: 4.7.0 - apiVersion: v1 - appVersion: 4.6.0.12 - created: "2020-03-07T03:47:41.054267+05:30" + appVersion: 4.6.0.13 + created: "2020-03-16T23:01:17.605315+05:30" description: A Helm chart for Aerospike Server Community Edition on Kubernetes - digest: 69040ff91fed43f242f5e45c32dbce5034e96846e787e9af8dcf6b60dd880a70 + digest: b5944cd78bc239856781e1c14d1993923f7d9fc0a7b3e5349da02d60e2bd0262 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 maintainers: - email: kesan@aerospike.com @@ -55,4 +55,4 @@ entries: urls: - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.6.0.tgz version: 4.6.0 -generated: "2020-03-07T03:47:41.05153+05:30" +generated: "2020-03-16T23:01:17.603744+05:30" diff --git a/examples/shadow-device/statefulset-shadow-device.yaml b/examples/shadow-device/statefulset-shadow-device.yaml index 7d71e59..726cc98 100644 --- a/examples/shadow-device/statefulset-shadow-device.yaml +++ b/examples/shadow-device/statefulset-shadow-device.yaml @@ -97,9 +97,7 @@ spec: fieldPath: status.podIP initContainers: - name: aerospike-init - image: aerospike/aerospike-tools - command: ["/bin/sh"] - args: ["-c", "cp /configs/install.sh /install.sh && chmod +x /install.sh && /install.sh"] + image: aerospike/aerospike-kubernetes-init:latest volumeMounts: - name: confdir mountPath: /etc/aerospike diff --git a/examples/storage-engine-device/statefulset-raw-device.yaml b/examples/storage-engine-device/statefulset-raw-device.yaml index 7ff7924..c2ed8ad 100644 --- a/examples/storage-engine-device/statefulset-raw-device.yaml +++ b/examples/storage-engine-device/statefulset-raw-device.yaml @@ -95,9 +95,7 @@ spec: fieldPath: status.podIP initContainers: - name: aerospike-init - image: aerospike/aerospike-tools - command: ["/bin/sh"] - args: ["-c", "cp /configs/install.sh /install.sh && chmod +x /install.sh && /install.sh"] + image: aerospike/aerospike-kubernetes-init:latest volumeMounts: - name: confdir mountPath: /etc/aerospike diff --git a/helm/CHANGELOG.md b/helm/CHANGELOG.md index f1449b4..ca4f554 100644 --- a/helm/CHANGELOG.md +++ b/helm/CHANGELOG.md @@ -2,6 +2,15 @@ This file documents all notable changes to Aerospike Helm Chart (Community Edition). +## [1.2.1](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.2.1) + +- Fixed alertmanager's default dummy configuration to avoid `CrashLoopBackOff`. +- Improved usage documentation +- Chart `4.6.0` updated to use Aerospike Server version `4.6.0.13` +- Chart `4.7.0` updated to use Aerospike Server version `4.7.0.11` +- Chart `4.8.0` updated to use Aerospike Server version `4.8.0.6` + + ## [1.2.0](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.2.0) - Uses new `aerospike/aerospike-kubernetes-init` image @@ -18,10 +27,12 @@ This file documents all notable changes to Aerospike Helm Chart (Community Editi - Chart `4.7.0` updated to use Aerospike Server version `4.7.0.10` - Chart `4.8.0` updated to use Aerospike Server version `4.8.0.5` + ## [1.1.0](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.1.0) - Update Chart `4.7.0` to use Aerospike Server version `4.7.0.5` (appVersion). - Update Chart `4.6.0` to use Aerospike Server version `4.6.0.8` (appVersion). + ## [1.0.0](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.0.0) - Supports `NodeAffinity`/`PodAffinity`/`PodAntiAffinity` rules. diff --git a/helm/Chart.yaml b/helm/Chart.yaml index d18d2da..aaa252c 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -16,7 +16,7 @@ # ------------------------------------------------------------------------------ apiVersion: v1 -appVersion: 4.8.0.5 +appVersion: 4.8.0.6 description: A Helm chart for Aerospike Server Community Edition on Kubernetes name: aerospike version: 4.8.0 diff --git a/helm/README.md b/helm/README.md index b38bfba..0a1eb04 100644 --- a/helm/README.md +++ b/helm/README.md @@ -21,7 +21,7 @@ helm repo add aerospike https://aerospike.github.io/aerospike-kubernetes helm install aerospike-release aerospike/aerospike ``` -User can set any configuration values defined in `values.yaml` using `--set` option or provide a `values.yaml` file using `-f` option with `helm install`. +All the configurations defined in [`values.yaml`](values.yaml) or in the [configuration section](#configuration) can be set using `--set` or `--set-file` option. A custom `values.yaml` file can also be provided using `-f` option. For example, @@ -59,14 +59,15 @@ helm install --name aerospike-release aerospike/aerospike --set dbReplicas=5 ..... ``` -- Use `confFilePath` on `helm install` with `--set-file` option. +- `confFilePath` can be set using `--set-file` option, ```sh - helm install aerospike-release aerospike/aerospike --set-file confFilePath=/tmp/aerospike_templates/aerospike.template.conf + helm install aerospike-release aerospike/aerospike \ + --set-file confFilePath=/tmp/aerospike_templates/aerospike.template.conf ``` ### Storage configuration -User can configure multiple volume mounts (filesystem type) or device mounts (raw block device) or both in `values.yaml`. Check below [configuration section](#configuration) and [`values.yaml`](values.yaml) file in [this repository](https://github.com/aerospike/aerospike-kubernetes/tree/master/helm) for more details. +Aerospike helm chart allows multiple volume mounts (filesystem type) and device mounts (raw block device) to be configured and used with Aerospike Statefulset. Check below [configuration section](#configuration) or [`values.yaml`](https://github.com/aerospike/aerospike-kubernetes/blob/master/helm/values.yaml) file for more details. ### Test Output: @@ -100,12 +101,12 @@ statefulset.apps/aerospike-release-aerospike 3/3 49m ```sh $ helm list NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE -aerospike-release 1 Fri Mar 6 15:50:33 2020 DEPLOYED aerospike-4.8.0 4.8.0.5 default +aerospike-release 1 Fri Mar 6 15:50:33 2020 DEPLOYED aerospike-4.8.0 4.8.0.6 default ``` ### Expose Aerospike Cluster -Aerospike Cluster can be exposed to client applications or to XDR clients outside the K8s network by enabling, +Aerospike Cluster can be exposed to client applications or to XDR clients which are outside the K8s network by enabling, - Host Networking - NodePort Services Per Pod - LoadBalancer Services Per Pod @@ -123,21 +124,21 @@ For example, ```sh helm install aerospike-release aerospike/aerospike \ - --set dbReplicas=4 \ - --set hostNetworking=true \ - --set platform=gke + --set dbReplicas=4 \ + --set hostNetworking=true \ + --set platform=gke ``` For Helm v2, ```sh helm install --name aerospike-release aerospike/aerospike \ - --set dbReplicas=4 \ - --set hostNetworking=true \ - --set platform=gke + --set dbReplicas=4 \ + --set hostNetworking=true \ + --set platform=gke ``` -Client applications can connect to the Aerospike cluster using instance's external IP (if available) or else by simply using host IP. +Client applications can connect to the Aerospike cluster using instance's external IP (if available) or by using host IP. ```sh asadm -h -p 3000 --services-alternate @@ -147,16 +148,16 @@ asadm -h -p 3000 --services-alternate NodePort type exposes the Service on each K8s Node’s IP at a static port (the `NodePort`). Applications will be able to connect to the NodePort Service from outside the K8s cluster by using `:`. -> With NodePort type services, it allows multiple pods per K8s host as well as expose each aerospike pod. +> With NodePort type services, it allows multiple aerospike pods per K8s host and at the same time expose each aerospike pod. To enable `NodePort` services per pod, `enableNodePortServices` option must be set to `true`. -Aerospike helm chart will automatically create a `NodePort` type service for each aerospike pod at the time of deployment. Applications can connect to the Aerospike cluster using any one of `:` as seed IP and Port. +Aerospike helm chart will automatically create a `NodePort` type service for each aerospike pod at the time of deployment. Applications can connect to the Aerospike cluster using any one of the `:` as a seed IP and Port. Setting `platform` will fetch external IP of the instances (if any) and add it to [`alternate-access-address`](https://www.aerospike.com/docs/reference/configuration/index.html#alternate-access-address) in `aerospike.conf`. -> It is recommended to use `helm upgrade` command to perform scale-up/scale-down when NodePort services are enabled. +> Use `helm upgrade` command to perform scale-up/scale-down when NodePort services are enabled. -User must specify a service account with appropriate permissions to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. User can also set `rbac.create` to `true` for which Aerospike helm chart will automatically create a new serviceAccount with appropriate permissions and use it for the statefulset deployment. +A service account with appropriate permissions is required to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. To let Aerospike helm chart create a new `ServiceAccount` with appropriate `ClusterRole` set `rbac.create` to `true`. This `ServiceAccount` will be used with Aerospike Statefulset, and if monitoring is enabled, also with Prometheus, Grafana and Alertmanager Statefulsets. Example, @@ -180,7 +181,7 @@ helm install --name aerospike-release aerospike/aerospike \ LoadBalancer type exposes the service externally using the cloud provider’s load balancer. A new external network load balancer is provisioned. -> With LoadBalancer type services, it allows multiple pods per K8s host as well as expose each pod. +> With LoadBalancer type services, it allows multiple aerospike pods per K8s host and at the same time expose each aerospike pod. To enable `LoadBalancer` services per pod, `enableLoadBalancerServices` option must be set to `true`. Aerospike helm chart will automatically create a `LoadBalancer` type service for each aerospike pod at the time of deployment. @@ -191,9 +192,9 @@ Applications can connect to the Aerospike cluster using ` asadm -h -p --services-alternate ``` -> It is recommended to use `helm upgrade` command to perform scale-up/scale-down when LoadBalancer type services are enabled. +> Use `helm upgrade` command to perform scale-up/scale-down when LoadBalancer type services are enabled. -User must specify a service account with appropriate permissions to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. User can also set `rbac.create` to `true` for which Aerospike helm chart will automatically create a new serviceAccount with appropriate permissions and use it for the statefulset deployment. +A service account with appropriate permissions is required to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. To let Aerospike helm chart create a new `ServiceAccount` with appropriate `ClusterRole` set `rbac.create` to `true`. This `ServiceAccount` will be used with Aerospike Statefulset, and if monitoring is enabled, also with Prometheus, Grafana and Alertmanager Statefulsets. Example, @@ -215,16 +216,15 @@ helm install --name aerospike-release aerospike/aerospike \ ### **ClusterIP Services with External IPs** -`ClusterIP` type exposes the service on a cluster-internal IP. With external IPs set, the service can be accessed from its external endpoint. +`ClusterIP` type exposes the service on a cluster-internal IP. With external IPs set, the service can be accessed from an external endpoint. -With `enableExternalIpServices` option enabled, Aerospike helm chart will create a `ClusterIP` type service for each aerospike pod at the time of deployment. User can specify only one external IP and Port. -The external endpoints can be specified using `externalIpEndpoints` option. Check [`values.yaml`](values.yaml). +With `enableExternalIpServices` option enabled, Aerospike helm chart will create a `ClusterIP` type service for each aerospike pod at the time of deployment. The external endpoints can be specified using `externalIpEndpoints` option. -> It is recommended to use `helm upgrade` command to perform scale-up/scale-down when ClusterIP-ExternalIP services are enabled. +> Use `helm upgrade` command to perform scale-up/scale-down when ClusterIP-ExternalIP services are enabled. -> With `enableExternalIpService` enabled, user must specify number of endpoints equal to the number of Aerospike nodes/pods (`dbReplicas`). +> Number of endpoints should be equal to the number of Aerospike pods (`dbReplicas`). Only one external IP and Port per Service can be specified. -User must specify a service account with appropriate permissions to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. User can also set `rbac.create` to `true` for which Aerospike helm chart will automatically create a new serviceAccount with appropriate permissions and use it for the statefulset deployment. +A service account with appropriate permissions is required to query the API server and read the `Service` type resources. An existing service account can be specified using `rbac.serviceAccountName`. To let Aerospike helm chart create a new `ServiceAccount` with appropriate `ClusterRole` set `rbac.create` to `true`. This `ServiceAccount` will be used with Aerospike Statefulset, and if monitoring is enabled, also with Prometheus, Grafana and Alertmanager Statefulsets. Example, @@ -238,7 +238,7 @@ helm install aerospike-release aerospike/aerospike \ --set externalIpEndpoints[1].IP=10.160.15.224 \ --set externalIpEndpoints[1].Port=7002 \ --set externalIpEndpoints[2].IP=10.160.15.223 \ - --set externalIpEndpoints[2].Port=8001 + --set externalIpEndpoints[2].Port=8001 \ --set externalIpEndpoints[3].IP=10.160.15.223 \ --set externalIpEndpoints[3].Port=8002 ``` @@ -255,7 +255,7 @@ helm install --name aerospike-release aerospike/aerospike \ --set externalIpEndpoints[1].IP=10.160.15.224 \ --set externalIpEndpoints[1].Port=7002 \ --set externalIpEndpoints[2].IP=10.160.15.223 \ - --set externalIpEndpoints[2].Port=8001 + --set externalIpEndpoints[2].Port=8001 \ --set externalIpEndpoints[3].IP=10.160.15.223 \ --set externalIpEndpoints[3].Port=8002 ``` @@ -264,18 +264,31 @@ helm install --name aerospike-release aerospike/aerospike \ Aerospike Helm Chart provides Aerospike Monitoring Stack which includes an Aerospike prometheus exporter (sidecar), Prometheus statefulset, Grafana statefulset and Alertmanager statefulset. -User can enable Aerospike Monitoring by setting `enableAerospikeMonitoring` option to `true`. +Aerospike Monitoring can be enabled by setting `enableAerospikeMonitoring` option to `true`. -To add a custom Aerospike alert rules configuraton file, use option `--set-file prometheus.aerospikeAlertRulesFilePath`. +```sh +helm install aerospike-release aerospike/aerospike \ + --set rbac.create=true \ + --set enableAerospikeMonitoring=true +``` + +For Helm v2, + +```sh +helm install --name aerospike-release aerospike/aerospike \ + --set rbac.create=true \ + --set enableAerospikeMonitoring=true +``` + +Use option `--set-file prometheus.aerospikeAlertRulesFilePath` to add a custom aerospike alert rules configuration file. > `prometheus.aerospikeAlertRulesFilePath` should be a file path on helm "client" machine (where the user is running 'helm install') -To add an alertmanager configuration file, use option `--set-file alertmanager.alertmanagerConfFilePath`. +Use option `--set-file alertmanager.alertmanagerConfFilePath` to add an alertmanager configuration file. > `alertmanager.alertmanagerConfFilePath` should be a file path on helm "client" machine (where the user is running 'helm install') -Check below [configuration section](#configuration) and [`values.yaml`](values.yaml) file in [this repository](https://github.com/aerospike/aerospike-kubernetes/tree/master/helm) for more details on other configuration of the `Aerospike Prometheus Exporter`, `Prometheus`, `Grafana` and `Alertmanager`. - +Check the below [configuration section](#configuration) or [`values.yaml`](values.yaml) file for more details on configuration of the `Aerospike Prometheus Exporter`, `Prometheus`, `Grafana` and `Alertmanager`. ### Configuration @@ -284,7 +297,7 @@ Check below [configuration section](#configuration) and [`values.yaml`](values.y | `dbReplicas` | Number of Aerospike nodes or pods in the cluster | `3` | | `terminationGracePeriodSeconds` | Number of seconds to wait after `SIGTERM` before force killing the pod. | `120` | | `image.repository` | Aerospike Server Docker Image | `aerospike/aerospike-server` | -| `image.tag` | Aerospike Server Docker Image Tag | `4.8.0.5` | +| `image.tag` | Aerospike Server Docker Image Tag | `4.8.0.6` | | `initImage.repository` | Aerospike Kubernetes Init Container Image | `aerospike/aerospike-kubernetes-init` | | `initImage.tag` | Aerospike Kubernetes Init Container Image Tag | `1.0.0` | | `autoGenerateNodeIds` | Auto generate and assign node-id(s) based on Pod's Ordinal Index | `false` | diff --git a/helm/files/alertmanager.yaml b/helm/files/alertmanager.yaml index 87f214e..633097f 100644 --- a/helm/files/alertmanager.yaml +++ b/helm/files/alertmanager.yaml @@ -2,7 +2,7 @@ # Use "--set-file alertmanager.alertmanagerConfFilePath=" during "helm install" or "helm upgrade" to use custom alertmanager.yaml. global: - slack_api_url: "" + slack_api_url: "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX" route: group_by: ['alertname', 'cluster', 'service'] receiver: slack_general diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index ef6a562..348737c 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,3 +1,4 @@ + Thank you for installing {{ .Chart.Name }}-{{ .Chart.AppVersion }}. Release Name - {{ .Release.Name }}. __ @@ -22,5 +23,13 @@ Release Name - {{ .Release.Name }}. \/ \/ \/ \/ Run the following commands to get more information about deployment: + +For Helm v2, $ helm status {{ .Release.Name }} - $ helm get {{ .Release.Name }} \ No newline at end of file + $ helm get {{ .Release.Name }} + +For Helm v3, + $ helm status {{ .Release.Name }} + $ helm get all {{ .Release.Name }} + +$ kubectl get all --namespace {{ .Release.Namespace }} -l "release={{ .Release.Name }}, chart={{ $.Chart.Name }}-{{ $.Chart.Version }}" diff --git a/helm/templates/statefulset.yaml b/helm/templates/statefulset.yaml index b8cfb57..fbc0755 100644 --- a/helm/templates/statefulset.yaml +++ b/helm/templates/statefulset.yaml @@ -103,13 +103,13 @@ spec: command: - /bin/sh - -c - - "while true; do finished=0; for part in $( asadm --no-config-file -e 'asinfo -v statistics -l' | grep migrate_partitions_remaining | cut -d= -f2); do if [ $part != 0 ]; then finished=0; break; fi; finished=1; done; if [ $finished != 1 ]; then sleep 15; else exit 0; fi; done" + - "while true; do finished=0; for part in $( asadm -h localhost -p {{ .Values.aerospikeClientPort | default 3000 }} --no-config-file -e 'asinfo -v statistics -l' | grep migrate_partitions_remaining | cut -d= -f2); do if [ $part != 0 ]; then finished=0; break; fi; finished=1; done; if [ $finished != 1 ]; then sleep 3; else break; fi; done" livenessProbe: exec: command: - /bin/sh - -c - - "asinfo -v build" + - "asinfo -h localhost -p {{ .Values.aerospikeClientPort | default 3000 }} -v build" initialDelaySeconds: 30 periodSeconds: 60 readinessProbe: diff --git a/helm/values.yaml b/helm/values.yaml index 671a724..47240ad 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -35,7 +35,7 @@ terminationGracePeriodSeconds: 120 image: repository: aerospike/aerospike-server - tag: 4.8.0.5 + tag: 4.8.0.6 ### ------------------------------- ### Aerospike init container image diff --git a/manifests/statefulset.yaml b/manifests/statefulset.yaml index a67b363..344b730 100644 --- a/manifests/statefulset.yaml +++ b/manifests/statefulset.yaml @@ -94,9 +94,7 @@ spec: fieldPath: status.podIP initContainers: - name: aerospike-init - image: aerospike/aerospike-tools - command: ["/bin/sh"] - args: ["-c", "cp /configs/install.sh /install.sh && chmod +x /install.sh && /install.sh"] + image: aerospike/aerospike-kubernetes-init:latest volumeMounts: - name: confdir mountPath: /etc/aerospike