Skip to content

Commit

Permalink
INST-766 - Upgrade Elasticsearch and Mission Control to 7.6.1 and 4.3.2
Browse files Browse the repository at this point in the history
INST-766 - Add a note on compatibility of versions between Artifactory and Mission Control
  • Loading branch information
amithins committed Apr 21, 2020
1 parent cdb7fcf commit 498ed94
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 17 deletions.
6 changes: 6 additions & 0 deletions stable/mission-control/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# JFrog Mission-Control Chart Changelog
All changes to this chart will be documented in this file.

## [3.2.0] - Apr 21, 2020
* Upgrade Elasticsearch version to 7.6.1
* Upgrade Mission Control version to 4.3.2
* **NOTE:** If you have externalized elasticsearch, please upgrade your elasticsearch to 7.6.1 to work with Mission Control 4.3.x. Mission Control version 4.3.x and above is not compatible with Elasticsearch version 6.x.
* **NOTE:** Mission Control version 4.3.2 is compatible with Artifactory 7.4.1 and above. Refer Mission Control release notes for more details - https://www.jfrog.com/confluence/display/JFROG/Mission+Control+Release+Notes#MissionControlReleaseNotes-MissionControl4.3.2.

## [3.1.1] - April 13, 2020
* Update README with helm v3 commands

Expand Down
4 changes: 2 additions & 2 deletions stable/mission-control/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: mission-control
home: https://jfrog.com/mission-control/
version: 3.1.1
appVersion: 4.2.0
version: 3.2.0
appVersion: 4.3.2
description: A Helm chart for JFrog Mission Control
sources:
- https://bintray.com/jfrog/product/mission-control/view
Expand Down
9 changes: 7 additions & 2 deletions stable/mission-control/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ helm repo add jfrog https://charts.jfrog.io

### Install Chart

**NOTE:** Check [CHANGELOG.md] for version specific install notes.

#### Special Notes

Mission Control version 4.3.2 is compatible with Artifactory 7.4.1 and above. Refer Mission Control release notes for more details - https://www.jfrog.com/confluence/display/JFROG/Mission+Control+Release+Notes#MissionControlReleaseNotes-MissionControl4.3.2.

#### Artifactory Connection Details
In order to connect Mission Control to your Artifactory installation, you have to use a Join Key, hence it is *MANDATORY* to provide a Join Key and Jfrog Url to your Mission Control installation. Here's how you do that:

Expand Down Expand Up @@ -114,7 +120,7 @@ Once you have a new chart version, you can update your deployment with
helm upgrade mission-control jfrog/mission-control
```

**NOTE:** Check for any version specific upgrade nodes in [CHANGELOG.md]
**NOTE:** Check for any version specific upgrade notes in [CHANGELOG.md]

### Non compatible upgrades
In cases where a new version is not compatible with existing deployed version (look in CHANGELOG.md) you should
Expand Down Expand Up @@ -337,7 +343,6 @@ The following table lists the configurable parameters of the mission-control cha
| `elasticsearch.resources.limits.memory` | Elasticsearch memory limit | |
| `elasticsearch.resources.limits.cpu` | Elasticsearch cpu limit | |
| `elasticsearch.env.clusterName` | Elasticsearch Cluster Name | `es-cluster` |
| `elasticsearch.env.minimumMasterNodes` | The value for discovery.zen.minimum_master_nodes. Should be set to (replicaCount / 2) + 1 | `1` |
| `logger.image.repository` | repository for logger image | `busybox` |
| `logger.image.tag` | tag for logger image | `1.30` |
| `missionControl.name` | Mission Control name | `mission-control` |
Expand Down
12 changes: 12 additions & 0 deletions stable/mission-control/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ If release name contains chart name it will be used as a full name.
{{- end -}}
{{- end -}}

{{/*
Create a list of elasticsearch master eligible nodes.
This will create one entry per replica.
*/}}
{{- define "elasticsearch.endpoints" -}}
{{- $replicas := int (toString (.Values.replicaCount)) }}
{{- $releaseName := printf "%s" (include "mission-control.fullname" .) }}
{{- range $i, $e := untilStep 0 $replicas 1 -}}
{{ $releaseName }}-{{ $i }},
{{- end -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
Expand Down
15 changes: 4 additions & 11 deletions stable/mission-control/templates/mission-control-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ spec:
value: '{{ .Values.elasticsearch.httpPort }}'
- name: 'transport.port'
value: '{{ .Values.elasticsearch.transportPort }}'
# - name: 'discovery.zen.minimum_master_nodes'
# value: '{{ .Values.elasticsearch.env.minimumMasterNodes }}'
# - name: 'discovery.zen.ping.unicast.hosts'
# value: '{{ .Release.Name }}-mission-control'
- name: 'discovery.seed_hosts'
value: '{{ template "mission-control.fullname" . }}'
- name: 'cluster.initial_master_nodes'
value: '{{ template "elasticsearch.endpoints" . }}'
- name: ELASTIC_SEARCH_USERNAME
value: '{{ .Values.elasticsearch.username }}'
- name: ELASTIC_SEARCH_PASSWORD
Expand All @@ -249,13 +249,6 @@ spec:
"
- name: ELASTIC_SEARCH_URL
value: '{{ .Values.elasticsearch.url }}'
# lifecycle:
# postStart:
# exec:
# command:
# - '/bin/bash'
# - '-c'
# - 'sh /scripts/initSG.sh'
ports:
- name: eshttp
containerPort: {{ .Values.elasticsearch.httpPort }}
Expand Down
1 change: 1 addition & 0 deletions stable/mission-control/templates/mission-control-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
port: {{ .Values.elasticsearch.transportPort }}
targetPort: estransport
{{- end }}
publishNotReadyAddresses: true
selector:
app: {{ template "mission-control.name" . }}
component: {{ .Values.missionControl.name }}
Expand Down
3 changes: 1 addition & 2 deletions stable/mission-control/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ elasticsearch:
initContainerImage: "alpine:3.6"
image:
repository: docker.bintray.io/jfrog/elasticsearch-oss
tag: 6.6.0
tag: 7.6.1
pullPolicy: IfNotPresent
## Enter elasticsearch connection details
url: http://localhost:9200
Expand All @@ -199,7 +199,6 @@ elasticsearch:
networkHost: "0.0.0.0"
transportHost: "0.0.0.0"
maxMapCount: 262144
minimumMasterNodes: 1

persistence:
enabled: true
Expand Down

0 comments on commit 498ed94

Please sign in to comment.