mirror of
https://github.com/ZwareBear/JFrog-Cloud-Installers.git
synced 2026-01-21 15:06:57 -06:00
Openshift IaaS upgrades
This commit is contained in:
John Peterson
Jeff Fry
@@ -1,6 +1,9 @@
|
||||
# JFrog Openshift Artifactory-Xray Chart Changelog
|
||||
All changes to this chart will be documented in this file.
|
||||
|
||||
## [6.1.2] Oct 22nd, 2020
|
||||
* Updating to Xray chart version 6.1.2 and Xray app version 3.9.1
|
||||
|
||||
## [6.0.6] Oct 1st, 2020
|
||||
* Updating to Xray chart version 6.0.6 and Xray app version 3.8.8
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
apiVersion: v1
|
||||
appVersion: 3.8.8
|
||||
appVersion: 3.9.1
|
||||
description: Universal component scan for security and license inventory and impact analysis
|
||||
sources:
|
||||
- https://bintray.com/jfrog/product/xray/view
|
||||
@@ -13,4 +13,4 @@ maintainers:
|
||||
- email: johnp@jfrog.com
|
||||
name: John Peterson
|
||||
name: openshift-xray
|
||||
version: 6.0.6
|
||||
version: 6.1.2
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# PreReq'd:
|
||||
# helm install postgres bitnami/postgresql
|
||||
# follow artifactory postgresql db setup:
|
||||
# https://www.jfrog.com/confluence/display/JFROG/PostgreSQL
|
||||
POSTGRES=$(helm ls | grep postgres | wc -l)
|
||||
ARTIFACTORY=$(helm ls | grep artifactory | wc -l)
|
||||
if [[ "$POSTGRES" =~ (0) ]]
|
||||
then
|
||||
echo "External DB is required to run Jfrog Openshift Xray Helm chart"
|
||||
echo ""
|
||||
echo "Postgresql helm chart must be installed prior to installing this helm installer script."
|
||||
echo ""
|
||||
echo "helm install postgres bitnami/postgresql"
|
||||
echo ""
|
||||
echo "follow artifactory postgresql db setup:"
|
||||
echo "https://www.jfrog.com/confluence/display/JFROG/PostgreSQL"
|
||||
exit 1
|
||||
elif [[ "$ARTIFACTORY" =~ (0) ]]
|
||||
then
|
||||
echo "Artifactory Instance is required to run Jfrog Openshift Xray Helm chart"
|
||||
echo ""
|
||||
echo "Please use helm to first install Artifactory: openshift-artifactory-ha"
|
||||
echo ""
|
||||
echo "Then install Openshift xray helm chart once artifactory is ready."
|
||||
echo ""
|
||||
exit 1
|
||||
else
|
||||
echo "Installing Openshift Xray Helm"
|
||||
fi
|
||||
|
||||
DBURL=""
|
||||
if [[ -z "$1" ]]
|
||||
then
|
||||
DBURL="postgres://postgres-postgresql:5432/xraydb?sslmode=disable"
|
||||
else
|
||||
DBURL=$1
|
||||
fi
|
||||
|
||||
DBUSER=""
|
||||
if [[ -z "$2" ]]
|
||||
then
|
||||
DBUSER="artifactory"
|
||||
else
|
||||
DBUSER=$2
|
||||
fi
|
||||
|
||||
DBPASS=""
|
||||
if [[ -z "$3" ]]
|
||||
then
|
||||
DBPASS="password"
|
||||
else
|
||||
DBPASS=$3
|
||||
fi
|
||||
|
||||
JFROGURL=""
|
||||
if [[ -z "$4" ]]
|
||||
then
|
||||
# HELM
|
||||
JFROGURL="http://artifactory-ha-nginx"
|
||||
# OPERATOR
|
||||
# JFROGURL="http://openshiftartifactoryha-nginx"
|
||||
else
|
||||
JFROGURL=$4
|
||||
fi
|
||||
|
||||
|
||||
# install via helm with default postgresql configuration
|
||||
helm install xray . \
|
||||
--set xray.database.url=$DBURL \
|
||||
--set xray.database.user=$DBUSER \
|
||||
--set xray.database.password=$DBPASS \
|
||||
--set xray.xray.jfrogUrl=$JFROGURL \
|
||||
--set xray.xray.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
|
||||
--set xray.xray.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
|
||||
@@ -1,25 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app: rabbitmq
|
||||
name: rabbitmq
|
||||
namespace: default
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: rabbitmq
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: rabbitmq
|
||||
spec:
|
||||
containers:
|
||||
- image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.8.9
|
||||
imagePullPolicy: "Always"
|
||||
name: xray-rabbitmq
|
||||
ports:
|
||||
- containerPort: 4369
|
||||
- containerPort: 5672
|
||||
- containerPort: 15672
|
||||
@@ -1,26 +0,0 @@
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: rabbitmq-lb
|
||||
labels:
|
||||
app: rabbitmq
|
||||
spec:
|
||||
selector:
|
||||
app: rabbitmq
|
||||
ports:
|
||||
- name: epmd
|
||||
protocol: TCP
|
||||
port: 4369
|
||||
targetPort: 4369
|
||||
- name: ampq
|
||||
protocol: TCP
|
||||
port: 5672
|
||||
targetPort: 5672
|
||||
- name: management
|
||||
protocol: TCP
|
||||
port: 15672
|
||||
targetPort: 25672
|
||||
type: ClusterIP
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- name: xray
|
||||
repository: https://charts.jfrog.io/
|
||||
version: 6.0.6
|
||||
digest: sha256:339b5ec4e309ce2970ed34ebc700d6fe8f436d6cbe8dd5d352f0b080401752af
|
||||
generated: "2020-10-01T15:04:29.008985-07:00"
|
||||
version: 6.2.1
|
||||
digest: sha256:7bce8744ad24ebe2d962738cb688412c44c200b0b0015afb4471df479d826fde
|
||||
generated: "2020-10-23T12:58:46.07336-07:00"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
dependencies:
|
||||
- name: xray
|
||||
version: 6.0.6
|
||||
version: 6.2.1
|
||||
repository: https://charts.jfrog.io/
|
||||
|
||||
@@ -13,15 +13,30 @@ xray:
|
||||
url: "OVERRIDE"
|
||||
user: "OVERRIDE"
|
||||
password: "OVERRIDE"
|
||||
initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
|
||||
common:
|
||||
xrayUserId: "1000721035"
|
||||
xrayGroupId: "1000721035"
|
||||
xrayVersion: "3.10.3-1"
|
||||
customInitContainers: |
|
||||
- name: "prepare-uid-persistent-volume"
|
||||
image: "{{ .Values.initContainerImage }}"
|
||||
imagePullPolicy: "{{ .Values.imagePullPolicy }}"
|
||||
command:
|
||||
- 'sh'
|
||||
- '-c'
|
||||
- >
|
||||
chown -Rv {{ .Values.common.xrayUserId }}:{{ .Values.common.xrayGroupId }} {{ .Values.xray.persistence.mountPath }}
|
||||
securityContext:
|
||||
runAsUser: 0
|
||||
volumeMounts:
|
||||
- mountPath: "{{ .Values.xray.persistence.mountPath }}"
|
||||
name: data-volume
|
||||
analysis:
|
||||
name: xray-analysis
|
||||
image:
|
||||
registry: registry.connect.redhat.com
|
||||
repository: jfrog/xray-analysis
|
||||
tag: 3.8.8
|
||||
updateStrategy: RollingUpdate
|
||||
podManagementPolicy: Parallel
|
||||
preStartCommand:
|
||||
@@ -30,7 +45,6 @@ xray:
|
||||
image:
|
||||
registry: registry.connect.redhat.com
|
||||
repository: jfrog/xray-indexer
|
||||
tag: 3.8.8
|
||||
updateStrategy: RollingUpdate
|
||||
podManagementPolicy: Parallel
|
||||
persist:
|
||||
@@ -38,7 +52,6 @@ xray:
|
||||
image:
|
||||
registry: registry.connect.redhat.com
|
||||
repository: jfrog/xray-persist
|
||||
tag: 3.8.8
|
||||
updateStrategy: RollingUpdate
|
||||
podManagementPolicy: Parallel
|
||||
persistence:
|
||||
@@ -49,7 +62,6 @@ xray:
|
||||
image:
|
||||
registry: registry.connect.redhat.com
|
||||
repository: jfrog/xray-server
|
||||
tag: 3.8.8
|
||||
updateStrategy: RollingUpdate
|
||||
podManagementPolicy: Parallel
|
||||
replicaCount: 1
|
||||
@@ -58,14 +70,14 @@ xray:
|
||||
image:
|
||||
registry: registry.connect.redhat.com
|
||||
repository: jfrog/xray-router
|
||||
tag: 1.4.3
|
||||
imagePullPolicy: IfNotPresent
|
||||
tag: 3.10.3-1
|
||||
rabbitmq-ha:
|
||||
enabled: true
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
|
||||
tag: 3.8.9
|
||||
tag: 3.10.3-1
|
||||
rabbitmqEpmdPort: 4369
|
||||
rabbitmqNodePort: 5672
|
||||
rabbitmqManagerPort: 15672
|
||||
|
||||
Reference in New Issue
Block a user