Skip to content

Commit

Permalink
Merge pull request jfrog#25 from jfrog/xray-2.3.2
Browse files Browse the repository at this point in the history
Set Xray version 2.3.2
  • Loading branch information
jainishshah17 authored Sep 4, 2018
2 parents 4173901 + a2ad1f5 commit 517c6bd
Showing 8 changed files with 27 additions and 97 deletions.
4 changes: 4 additions & 0 deletions stable/xray/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# JFrog Xray Chart Changelog
All notable changes to this chart will be documented in this file.

## [0.5.0] - Sep 3, 2018
* New RabbitMQ HA helm chart version 1.9.1
* Updated Xray version to 2.3.2

## [0.4.1] - Aug 22, 2018
* Updated Xray version to 2.3.0

8 changes: 4 additions & 4 deletions stable/xray/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
apiVersion: v1
name: xray
version: 0.4.1
appVersion: 2.3.0
version: 0.5.0
appVersion: 2.3.2
home: https://www.jfrog.com/xray/
description: Universal component scan for security and license inventory and impact analysis
keywords:
- xray
- jfrog
sources:
- https://bintray.com/jfrog/product/xray/view
- https://github.com/JFrogDev
- https://github.com/jfrog/charts
maintainers:
- name: eldada
email: [email protected]
- email: [email protected]
name: jainishshah17
- email: [email protected]
name: rimusz
icon: https://raw.githubusercontent.com/JFrogDev/artifactory-dcos/master/images/jfrog_med.png
icon: https://raw.githubusercontent.com/jfrog/artifactory-dcos/master/images/jfrog_med.png
5 changes: 2 additions & 3 deletions stable/xray/README.md
Original file line number Diff line number Diff line change
@@ -177,13 +177,12 @@ The following table lists the configurable parameters of the xray chart and thei
| `rabbitmq-ha.replicaCount` | RabbitMQ Number of replica | `1` |
| `rabbitmq-ha.rabbitmqUsername` | RabbitMQ application username | `guest` |
| `rabbitmq-ha.rabbitmqPassword` | RabbitMQ application password | ` ` |
| `rabbitmq-ha.customConfigMap` | RabbitMQ Use a custom ConfigMap | `true` |
| `rabbitmq-ha.rabbitmqErlangCookie` | RabbitMQ Erlang cookie | `XRAYRABBITMQCLUSTER`|
| `rabbitmq-ha.rabbitmqMemoryHighWatermark` | RabbitMQ Memory high watermark | `500MB` |
| `rabbitmq-ha.persistentVolume.enabled` | If `true`, persistent volume claims are created | `true` |
| `rabbitmq-ha.persistentVolume.size` | RabbitMQ Persistent volume size | `20Gi` |
| `rabbitmq-ha.rbac.create` | If true, create & use RBAC resources | `true` |
| `common.xrayVersion` | Xray image tag | `2.3.0` |
| `rabbitmq-ha.rbac.create` | If true, create & use RBAC resources | `true` |
| `common.xrayVersion` | Xray image tag | `.Chart.AppVersion` |
| `common.xrayConfigPath` | Xray config path | `/var/opt/jfrog/xray/data` |
| `common.xrayUserId` | Xray User Id | `1035` |
| `common.xrayGroupId` | Xray Group Id | `1035` |
4 changes: 0 additions & 4 deletions stable/xray/ci/test-values.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions stable/xray/requirements.lock
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@ dependencies:
version: 0.8.7
- name: rabbitmq-ha
repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.5.2
version: 1.9.1
- name: mongodb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 2.0.5
digest: sha256:0893dc655e9e80daccdacc2650305aed5a2522cbf7216325f241a0ec3dd62cda
generated: 2018-05-29T09:44:00.736196764-07:00
digest: sha256:4ae0b0642b3c9c18d7cc2481753d795f3148f18f6084e81ecef814c7b5ab9fbb
generated: 2018-09-02T19:14:15.90991073+03:00
2 changes: 1 addition & 1 deletion stable/xray/requirements.yaml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ dependencies:
repository: https://kubernetes-charts.storage.googleapis.com/
condition: postgresql.enabled
- name: rabbitmq-ha
version: 1.5.2
version: 1.9.1
repository: https://kubernetes-charts.storage.googleapis.com/
- name: mongodb
version: 2.0.5
78 changes: 0 additions & 78 deletions stable/xray/templates/rabbitmq-ha-configmap.yaml

This file was deleted.

17 changes: 13 additions & 4 deletions stable/xray/values.yaml
Original file line number Diff line number Diff line change
@@ -111,12 +111,22 @@ mongodb:
##
rabbitmq-ha:
replicaCount: 1
rabbitmqUsername: "guest"
rabbitmqUsername: guest
rabbitmqPassword:
customConfigMap: true
rabbitmqErlangCookie: XRAYRABBITMQCLUSTER
rabbitmqMemoryHighWatermark: 500MB
rabbitmqNodePort: 5672
policies: |-
{
"name": "ha-all",
"apply-to": "all",
"pattern": ".*",
"vhost": "/",
"definition": {
"ha-mode": "all",
"ha-sync-mode": "automatic",
}
}
# resources:
# requests:
# memory: "250Mi"
@@ -132,7 +142,7 @@ rabbitmq-ha:

common:
## Note that by default we use appVersion to get image tag
# xrayVersion: 2.3.0
# xrayVersion: 2.3.2
xrayConfigPath: /var/opt/jfrog/xray/data
xrayUserId: 1035
xrayGroupId: 1035
@@ -149,7 +159,6 @@ global:
mongoUrl:
postgresqlUrl:


analysis:
name: xray-analysis
image: docker.bintray.io/jfrog/xray-analysis

0 comments on commit 517c6bd

Please sign in to comment.