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

Openshift Xray updates to 3.15.1

Browse Source
This commit is contained in:
John Peterson
2020-12-30 15:14:51 -08:00
parent 83416d4993
commit 2c37cdd85c
23 changed files with 586 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
View File

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-ha Chart Changelog # JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file. All changes to this chart will be documented in this file.
## [4.5.5] - Dec 18, 2020
* Updating to latest jfrog/artifactory-ha helm chart version 4.5.5 artifactory version 7.11.5
## [4.5.4] - Dec 2, 2020 ## [4.5.4] - Dec 2, 2020
* Updating to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5 * Updating to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5

2
Openshift4/helm/openshift-artifactory-ha/Chart.yaml
View File

@@ -16,4 +16,4 @@ name: openshift-artifactory-ha
sources: sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts - https://github.com/jfrog/charts
version: 4.5.4 version: 4.5.5

9
Openshift4/helm/openshift-artifactory-ha/README.md
View File

@@ -25,6 +25,15 @@ To deploy this helm chart you will need to be a cluster admin w/ access to the a
oc adm policy add-scc-to-user anyuid -z my_user_name oc adm policy add-scc-to-user anyuid -z my_user_name
```` ````
## Deploying the Helm Chart
To deploy the helm chart from this folder first pull the dependency charts with:
````bash
helm dep build
````
## Prerequisites Details ## Prerequisites Details
* Kubernetes 1.12+ * Kubernetes 1.12+

6
Openshift4/helm/openshift-artifactory-ha/requirements.lock
View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: artifactory-ha - name: artifactory-ha
repository: https://charts.jfrog.io/ repository: https://charts.jfrog.io/
version: 4.5.4 version: 4.5.5
digest: sha256:a1206fb1e2339a524d11c7ccff47216e426e1d475508430b670fac9f0ec81ddf digest: sha256:19224b0c0063a50a3e5b630b44bf80c86ae40642dd08a525e2bdb55a910bc865
generated: "2020-12-02T16:39:18.100741-08:00" generated: "2020-12-18T07:50:40.638679-08:00"

2
Openshift4/helm/openshift-artifactory-ha/requirements.yaml
View File

@@ -1,4 +1,4 @@
dependencies: dependencies:
- name: artifactory-ha - name: artifactory-ha
version: 4.5.4 version: 4.5.5
repository: https://charts.jfrog.io/ repository: https://charts.jfrog.io/

3
Openshift4/helm/openshift-xray/CHANGELOG.md
View File

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-Xray Chart Changelog # JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file. All changes to this chart will be documented in this file.
## [6.8.3] Dec 29, 2020
* Updating to Xray chart version 6.8.3 and Xray app version 3.15.1
## [6.5.1] Dec 2, 2020 ## [6.5.1] Dec 2, 2020
* Updating to Xray chart version 6.5.1 and Xray app version 3.12.0 * Updating to Xray chart version 6.5.1 and Xray app version 3.12.0

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

@@ -1,5 +1,5 @@
apiVersion: v1 apiVersion: v1
appVersion: 3.12.0 appVersion: 3.15.1
description: Universal component scan for security and license inventory and impact analysis description: Universal component scan for security and license inventory and impact analysis
sources: sources:
- https://bintray.com/jfrog/product/xray/view - https://bintray.com/jfrog/product/xray/view
@@ -13,4 +13,4 @@ maintainers:
- email: johnp@jfrog.com - email: johnp@jfrog.com
name: John Peterson name: John Peterson
name: openshift-xray name: openshift-xray
version: 6.5.1 version: 6.8.3

4
Openshift4/helm/openshift-xray/helminstall.sh
View File

@@ -58,9 +58,9 @@ JFROGURL=""
if [[ -z "$4" ]] if [[ -z "$4" ]]
then then
# HELM # HELM
#JFROGURL="http://artifactory-ha-nginx" JFROGURL="http://artifactory-ha-nginx"
# OPERATOR # OPERATOR
JFROGURL="http://openshiftartifactoryha-nginx" #JFROGURL="http://openshiftartifactoryha-nginx"
else else
JFROGURL=$4 JFROGURL=$4
fi fi

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

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: xray - name: xray
repository: https://charts.jfrog.io/ repository: https://charts.jfrog.io/
version: 6.5.1 version: 6.8.3
digest: sha256:e7aeb1264f9cc5bda09678016e58467298d9e3e0d45a1def38edec72f2efebc4 digest: sha256:8ae5d5a4bf04831b85f739cdb8b7bd82385b9fe65582f202d1bb57ad6f2046e1
generated: "2020-12-02T16:41:37.497441-08:00" generated: "2020-12-29T08:09:20.559977-08:00"

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

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

6
Openshift4/helm/openshift-xray/values.yaml
View File

@@ -15,7 +15,7 @@ xray:
common: common:
xrayUserId: "1000721035" xrayUserId: "1000721035"
xrayGroupId: "1000721035" xrayGroupId: "1000721035"
xrayVersion: "3.12.0-1" xrayVersion: "3.15.1-1"
customInitContainers: | customInitContainers: |
- name: "prepare-uid-persistent-volume" - name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}" image: "{{ .Values.initContainerImage }}"
@@ -69,13 +69,13 @@ xray:
registry: registry.connect.redhat.com registry: registry.connect.redhat.com
repository: jfrog/xray-router repository: jfrog/xray-router
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
tag: 3.12.0-1 tag: 3.15.1-1
rabbitmq-ha: rabbitmq-ha:
enabled: true enabled: true
replicaCount: 1 replicaCount: 1
image: image:
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
tag: 3.12.0-1 tag: 3.15.1-1
rabbitmqEpmdPort: 4369 rabbitmqEpmdPort: 4369
rabbitmqNodePort: 5672 rabbitmqNodePort: 5672
rabbitmqManagerPort: 15672 rabbitmqManagerPort: 15672

4
Openshift4/operator/xray-operator/Dockerfile
View File

@@ -1,7 +1,7 @@
# Build the manager binary # Build the manager binary
FROM quay.io/operator-framework/helm-operator:v1.0.1 FROM quay.io/operator-framework/helm-operator:v1.3.0
LABEL name="JFrog Xray Enterprise Operator" \ LABEL name="JFrog Xray Enterprise Operator" \
description="Openshift operator to deploy JFrog Xray Enterprise based on the Red Hat Universal Base Image." \ description="Openshift operator to deploy JFrog Xray Enterprise based on the Red Hat Universal Base Image" \
vendor="JFrog" \ vendor="JFrog" \
summary="JFrog Xray Enterprise Operator" \ summary="JFrog Xray Enterprise Operator" \
com.jfrog.license_terms="https://jfrog.com/xray/eula/" com.jfrog.license_terms="https://jfrog.com/xray/eula/"

29
Openshift4/operator/xray-operator/bundle/1.1.6/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.6/manifests/xray-operator.v1.1.6.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.6/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.3.0
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.6/metadata/openshiftxray-operator.package.yaml Normal file
View File

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

19
Openshift4/operator/xray-operator/bundle/bundle-1.1.6.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.3.0
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.6/manifests /manifests/
COPY 1.1.6/metadata /metadata/
LABEL com.redhat.openshift.versions="v4.5,v4.6"
LABEL com.redhat.delivery.operator.bundle=true
LABEL com.redhat.delivery.backport=true

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

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-Xray Chart Changelog # JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file. All changes to this chart will be documented in this file.
## [6.8.3] Dec 29, 2020
* Updating to Xray chart version 6.8.3 and Xray app version 3.15.1
## [6.5.1] Dec 2, 2020 ## [6.5.1] Dec 2, 2020
* Updating to Xray chart version 6.5.1 and Xray app version 3.12.0 * Updating to Xray chart version 6.5.1 and Xray app version 3.12.0

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

@@ -1,5 +1,5 @@
apiVersion: v1 apiVersion: v1
appVersion: 3.12.0 appVersion: 3.15.1
description: Universal component scan for security and license inventory and impact analysis description: Universal component scan for security and license inventory and impact analysis
sources: sources:
- https://bintray.com/jfrog/product/xray/view - https://bintray.com/jfrog/product/xray/view
@@ -13,4 +13,4 @@ maintainers:
- email: johnp@jfrog.com - email: johnp@jfrog.com
name: John Peterson name: John Peterson
name: openshift-xray name: openshift-xray
version: 6.5.1 version: 6.8.3

4
Openshift4/operator/xray-operator/helm-charts/openshift-xray/helminstall.sh
View File

@@ -58,9 +58,9 @@ JFROGURL=""
if [[ -z "$4" ]] if [[ -z "$4" ]]
then then
# HELM # HELM
#JFROGURL="http://artifactory-ha-nginx" JFROGURL="http://artifactory-ha-nginx"
# OPERATOR # OPERATOR
JFROGURL="http://openshiftartifactoryha-nginx" #JFROGURL="http://openshiftartifactoryha-nginx"
else else
JFROGURL=$4 JFROGURL=$4
fi fi

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

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: xray - name: xray
repository: https://charts.jfrog.io/ repository: https://charts.jfrog.io/
version: 6.5.1 version: 6.8.3
digest: sha256:e7aeb1264f9cc5bda09678016e58467298d9e3e0d45a1def38edec72f2efebc4 digest: sha256:8ae5d5a4bf04831b85f739cdb8b7bd82385b9fe65582f202d1bb57ad6f2046e1
generated: "2020-12-02T16:41:37.497441-08:00" generated: "2020-12-29T08:09:20.559977-08:00"

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

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

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

@@ -15,7 +15,7 @@ xray:
common: common:
xrayUserId: "1000721035" xrayUserId: "1000721035"
xrayGroupId: "1000721035" xrayGroupId: "1000721035"
xrayVersion: "3.12.0-1" xrayVersion: "3.15.1-1"
customInitContainers: | customInitContainers: |
- name: "prepare-uid-persistent-volume" - name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}" image: "{{ .Values.initContainerImage }}"
@@ -69,13 +69,13 @@ xray:
registry: registry.connect.redhat.com registry: registry.connect.redhat.com
repository: jfrog/xray-router repository: jfrog/xray-router
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
tag: 3.12.0-1 tag: 3.15.1-1
rabbitmq-ha: rabbitmq-ha:
enabled: true enabled: true
replicaCount: 1 replicaCount: 1
image: image:
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
tag: 3.12.0-1 tag: 3.15.1-1
rabbitmqEpmdPort: 4369 rabbitmqEpmdPort: 4369
rabbitmqNodePort: 5672 rabbitmqNodePort: 5672
rabbitmqManagerPort: 15672 rabbitmqManagerPort: 15672