zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 03:06:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Artifactory 7.11.5 and Xray 3.12.0 Openshift Operators

Browse Source
This commit is contained in:
John Peterson
2020-12-02 20:00:14 -08:00
parent d5000ea319
commit 41e8065242
40 changed files with 1314 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Openshift4/operator/xray-operator/CHANGELOG.md
View File

@@ -1,6 +1,15 @@
# JFrog Openshift Xray Chart Changelog
All changes to this chart will be documented in this file.
## [1.1.5] Dec 2nd, 2020
* Deploying JFrog Xray 3.12.0 as an Operator into Openshift
## [1.1.4] Oct 24rd, 2020
* Deploying JFrog Xray 3.10.3 bug fixes
## [1.1.3] Oct 23rd, 2020
* Deploying JFrog Xray 3.10.3 bug fixes
## [1.1.2] Oct 23rd, 2020
* Deploying JFrog Xray 3.10.3 as an Operator into Openshift

29
Openshift4/operator/xray-operator/bundle/1.1.5/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml Normal file
View File

@@ -0,0 +1,29 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: openshiftxrays.charts.helm.k8s.io
spec:
group: charts.helm.k8s.io
names:
kind: OpenshiftXray
listKind: OpenshiftXrayList
plural: openshiftxrays
singular: openshiftxray
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ''
plural: ''
conditions: null
storedVersions: null

474
Openshift4/operator/xray-operator/bundle/1.1.5/manifests/xray-operator.v1.1.5.clusterserviceversion.yaml Normal file
View File

File diff suppressed because one or more lines are too long

12
Openshift4/operator/xray-operator/bundle/1.1.5/metadata/annotations.yaml Normal file
View File

@@ -0,0 +1,12 @@
annotations:
operators.operatorframework.io.bundle.channel.default.v1: alpha
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: openshiftxray-operator
operators.operatorframework.io.metrics.builder: operator-sdk-v1.0.1
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
operators.operatorframework.io.test.config.v1: tests/scorecard/
operators.operatorframework.io.test.mediatype.v1: scorecard+v1

5
Openshift4/operator/xray-operator/bundle/1.1.5/metadata/openshiftxray-operator.package.yaml Normal file
View File

@@ -0,0 +1,5 @@
channels:
- currentCSV: xray-operator.v1.1.5
name: alpha
defaultChannel: ''
packageName: openshiftxray-operator

19
Openshift4/operator/xray-operator/bundle/bundle-1.1.5.Dockerfile Normal file
View File

@@ -0,0 +1,19 @@
FROM scratch
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=openshiftxray-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.0.1
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
COPY 1.1.5/manifests /manifests/
COPY 1.1.5/metadata /metadata/
LABEL com.redhat.openshift.versions="v4.5,v4.6"
LABEL com.redhat.delivery.operator.bundle=true
LABEL com.redhat.delivery.backport=true

9
Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
View File

@@ -1,6 +1,15 @@
# JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file.
## [6.5.1] Dec 2, 2020
* Updating to Xray chart version 6.5.1 and Xray app version 3.12.0
## [6.4.2] Nov 20, 2020
* Updating to Xray chart version 6.4.2 and Xray app version 3.11.2
## [6.2.1] Oct 23rd, 2020
* Updating to Xray chart version 6.2.1 and Xray app version 3.10.3
## [6.1.2] Oct 22nd, 2020
* Updating to Xray chart version 6.1.2 and Xray app version 3.9.1

4
Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
View File

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 3.9.1
appVersion: 3.12.0
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.1.2
version: 6.5.1

0
Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE Executable file → Normal file
View File

0
Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md Normal file → Executable file
View File

76
Openshift4/operator/xray-operator/helm-charts/openshift-xray/helminstall.sh Executable file
View File

@@ -0,0 +1,76 @@
#!/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=$JOIN_KEY \
--set xray.xray.masterKey=$MASTER_KEY

76
Openshift4/operator/xray-operator/helm-charts/openshift-xray/helmupgrade.sh Executable file
View File

@@ -0,0 +1,76 @@
#!/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 upgrade --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=$JOIN_KEY \
--set xray.xray.masterKey=$MASTER_KEY

25
Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml Normal file
View File

@@ -0,0 +1,25 @@
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

26
Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml Normal file
View File

@@ -0,0 +1,26 @@
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

6
Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock
View File

@@ -1,6 +1,6 @@
dependencies:
- name: xray
repository: https://charts.jfrog.io/
version: 6.2.1
digest: sha256:7bce8744ad24ebe2d962738cb688412c44c200b0b0015afb4471df479d826fde
generated: "2020-10-23T12:58:46.07336-07:00"
version: 6.5.1
digest: sha256:e7aeb1264f9cc5bda09678016e58467298d9e3e0d45a1def38edec72f2efebc4
generated: "2020-12-02T16:41:37.497441-08:00"

2
Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml
View File

@@ -1,4 +1,4 @@
dependencies:
- name: xray
version: 6.2.1
version: 6.5.1
repository: https://charts.jfrog.io/

8
Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
View File

@@ -3,8 +3,6 @@ xray:
unifiedUpgradeAllowed: true
replicaCount: 1
xray:
masterKey: "OVERRIDE"
joinKey: "OVERRIDE"
consoleLog: false
jfrogUrl: "OVERRIDE"
postgresql:
@@ -17,7 +15,7 @@ xray:
common:
xrayUserId: "1000721035"
xrayGroupId: "1000721035"
xrayVersion: "3.10.3-1"
xrayVersion: "3.12.0-1"
customInitContainers: |
- name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}"
@@ -71,13 +69,13 @@ xray:
registry: registry.connect.redhat.com
repository: jfrog/xray-router
imagePullPolicy: IfNotPresent
tag: 3.10.3-1
tag: 3.12.0-1
rabbitmq-ha:
enabled: true
replicaCount: 1
image:
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
tag: 3.10.3-1
tag: 3.12.0-1
rabbitmqEpmdPort: 4369
rabbitmqNodePort: 5672
rabbitmqManagerPort: 15672