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

Merge pull request #52 from jfrog/openshift4

Browse Source 
Openshift IaaS upgrades
This commit is contained in:
John Peterson
2020-10-23 15:36:59 -07:00
committed by GitHub
parent cb5a841982 e4e29e0fd9
commit 04a86bd9ea
50 changed files with 1154 additions and 122 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
All changes to this chart will be documented in this file.
## [4.4.1] - Oct 22, 2020
* Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
## [4.2.0] - Oct 6, 2020
* Fixed upgrade path from 3.1.0 to 4.2.0
* Updating to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0

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

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 7.9.0
appVersion: 7.10.2
description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
home: https://www.jfrog.com/artifactory/
icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-ha/logo/artifactory-logo.png
@@ -16,4 +16,4 @@ name: openshift-artifactory-ha
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts
version: 4.2.0
version: 4.4.1

12
Openshift4/helm/openshift-artifactory-ha/helminstall.sh
View File

@@ -41,6 +41,9 @@ else
fi
fi
MASTER_KEY=$(openssl rand -hex 32)
JOIN_KEY=$(openssl rand -hex 32)
# install via helm with default postgresql configuration
helm install artifactory-ha . \
--set artifactory-ha.nginx.service.ssloffload=true \
@@ -52,6 +55,11 @@ helm install artifactory-ha . \
--set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
--set artifactory-ha.database.user=artifactory \
--set artifactory-ha.database.password=password \
--set artifactory-ha.artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
--set artifactory-ha.artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
--set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
--set artifactory-ha.artifactory.masterKey=$MASTER_KEY
echo "*** IMPORTANT ****"
echo "export MASTER_KEY=$MASTER_KEY"
echo "export JOIN_KEY=$JOIN_KEY"
echo "*** SUCCESS ****"

4
Openshift4/helm/openshift-artifactory-ha/helmupgrade.sh
View File

@@ -11,7 +11,7 @@ helm upgrade --install artifactory-ha . \
--set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
--set artifactory-ha.database.user=artifactory \
--set artifactory-ha.database.password=password \
--set artifactory-ha.artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
--set artifactory-ha.artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \
--set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
--set artifactory-ha.artifactory.masterKey=$MASTER_KEY \
--set artifactory-ha.databaseUpgradeReady=true

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

@@ -1,6 +1,6 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 4.2.0
digest: sha256:c5d4c457266ce8d7e0e8c6dcf326267c3ca4cbb8a03c81db68a8a0b45fde3d3e
generated: "2020-10-06T15:10:01.551465-07:00"
version: 4.4.1
digest: sha256:36d606673a7c0e6ae47e615c90d5df7e203c75e574da6d5166ed0ebf8bb8e44c
generated: "2020-10-22T12:12:43.277532-07:00"

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

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

4
Openshift4/helm/openshift-artifactory-ha/values.yaml
View File

@@ -10,7 +10,7 @@ artifactory-ha:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.2-1
waitForDatabase: true
installerInfo: '{ "productId": "Openshift_artifactory-ha/{{ .Chart.Version }}", "features": [ { "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}" }, { "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0" }, { "featureId": "Platform/Openshift" }, { "featureId": "Partner/ACC-006983" }, { "featureId": "Channel/Openshift" } ] }'
artifactory:
@@ -19,7 +19,7 @@ artifactory-ha:
image:
registry: registry.connect.redhat.com
repository: jfrog/artifactory-pro
tag: 7.9.0
tag: 7.10.2-1
node:
replicaCount: 2
waitForPrimaryStartup:

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

@@ -1,6 +1,12 @@
# JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file.
## [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
## [6.0.6] Oct 1st, 2020
* Updating to Xray chart version 6.0.6 and Xray app version 3.8.8

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

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 3.8.8
appVersion: 3.10.3
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.2.1

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

@@ -58,9 +58,9 @@ JFROGURL=""
if [[ -z "$4" ]]
then
# HELM
JFROGURL="http://artifactory-ha-nginx"
#JFROGURL="http://artifactory-ha-nginx"
# OPERATOR
#JFROGURL="http://openshiftartifactoryha-nginx"
JFROGURL="http://openshiftartifactoryha-nginx"
else
JFROGURL=$4
fi
@@ -72,5 +72,5 @@ helm install xray . \
--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
--set xray.xray.joinKey=$JOIN_KEY \
--set xray.xray.masterKey=$MASTER_KEY

10
Openshift4/operator/xray-operator/helm-charts/openshift-xray/helminstall.sh → Openshift4/helm/openshift-xray/helmupgrade.sh
View File

@@ -58,19 +58,19 @@ JFROGURL=""
if [[ -z "$4" ]]
then
# HELM
JFROGURL="http://artifactory-ha-nginx"
#JFROGURL="http://artifactory-ha-nginx"
# OPERATOR
# JFROGURL="http://openshiftartifactoryha-nginx"
JFROGURL="http://openshiftartifactoryha-nginx"
else
JFROGURL=$4
fi
# install via helm with default postgresql configuration
helm install xray . \
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=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
--set xray.xray.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
--set xray.xray.joinKey=$JOIN_KEY \
--set xray.xray.masterKey=$MASTER_KEY

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

@@ -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"

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

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

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

@@ -17,6 +17,7 @@ xray:
common:
xrayUserId: "1000721035"
xrayGroupId: "1000721035"
xrayVersion: "3.10.3-1"
customInitContainers: |
- name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}"
@@ -36,7 +37,6 @@ xray:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-analysis
tag: 3.8.8
updateStrategy: RollingUpdate
podManagementPolicy: Parallel
preStartCommand:
@@ -45,7 +45,6 @@ xray:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-indexer
tag: 3.8.8
updateStrategy: RollingUpdate
podManagementPolicy: Parallel
persist:
@@ -53,7 +52,6 @@ xray:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-persist
tag: 3.8.8
updateStrategy: RollingUpdate
podManagementPolicy: Parallel
persistence:
@@ -64,7 +62,6 @@ xray:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-server
tag: 3.8.8
updateStrategy: RollingUpdate
podManagementPolicy: Parallel
replicaCount: 1
@@ -73,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

3
Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
View File

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [1.1.2] - Oct 22, 2020
* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
## [1.1.1] - Oct 6, 2020
* Upgrade path fixed for both operator version 1.0.3 and 1.1.0
* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0

396
Openshift4/operator/artifactory-ha-operator/bundle/1.1.2/manifests/artifactory-ha-operator.v1.1.2.clusterserviceversion.yaml Normal file
View File

File diff suppressed because one or more lines are too long

29
Openshift4/operator/artifactory-ha-operator/bundle/1.1.2/manifests/openshiftartifactoryhas.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: openshiftartifactoryhas.charts.helm.k8s.io
spec:
group: charts.helm.k8s.io
names:
kind: OpenshiftArtifactoryHa
listKind: OpenshiftArtifactoryHaList
plural: openshiftartifactoryhas
singular: openshiftartifactoryha
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

12
Openshift4/operator/artifactory-ha-operator/bundle/1.1.2/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: openshiftartifactoryha-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

2
Openshift4/operator/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml → Openshift4/operator/artifactory-ha-operator/bundle/1.1.2/metadata/openshiftartifactoryha-operator.package.yaml
View File

@@ -1,5 +1,5 @@
channels:
- currentCSV: artifactory-ha-operator.v1.1.1
- currentCSV: artifactory-ha-operator.v1.1.2
name: alpha
defaultChannel: ''
packageName: openshiftartifactoryha-operator

43
Openshift4/operator/artifactory-ha-operator/bundle/1.1.2/tests/scorecard/config.yaml Normal file
View File

@@ -0,0 +1,43 @@
kind: Configuration
apiversion: scorecard.operatorframework.io/v1alpha3
metadata:
name: config
stages:
- parallel: true
tests:
- image: quay.io/operator-framework/scorecard-test:latest
entrypoint:
- scorecard-test
- basic-check-spec
labels:
suite: basic
test: basic-check-spec-test
- image: quay.io/operator-framework/scorecard-test:latest
entrypoint:
- scorecard-test
- olm-bundle-validation
labels:
suite: olm
test: olm-bundle-validation-test
- image: quay.io/operator-framework/scorecard-test:latest
entrypoint:
- scorecard-test
- olm-crds-have-validation
labels:
suite: olm
test: olm-crds-have-validation-test
- image: quay.io/operator-framework/scorecard-test:latest
entrypoint:
- scorecard-test
- olm-crds-have-resources
labels:
suite: olm
test: olm-crds-have-resources-test
- image: quay.io/operator-framework/scorecard-test:latest
entrypoint:
- scorecard-test
- olm-spec-descriptors
labels:
suite: olm
test: olm-spec-descriptors-test

19
Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.2.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=openshiftartifactoryha-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.2/manifests /manifests/
COPY 1.1.2/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/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
View File

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [4.4.1] - Oct 22, 2020
* Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
## [4.2.0] - Oct 6, 2020
* Fixed upgrade path from 3.1.0 to 4.2.0
* Updating to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0

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

@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 7.9.0
appVersion: 7.10.2
description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
home: https://www.jfrog.com/artifactory/
icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-ha/logo/artifactory-logo.png
@@ -16,4 +16,4 @@ name: openshift-artifactory-ha
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts
version: 4.2.0
version: 4.4.1

12
Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh
View File

@@ -41,6 +41,9 @@ else
fi
fi
MASTER_KEY=$(openssl rand -hex 32)
JOIN_KEY=$(openssl rand -hex 32)
# install via helm with default postgresql configuration
helm install artifactory-ha . \
--set artifactory-ha.nginx.service.ssloffload=true \
@@ -52,6 +55,11 @@ helm install artifactory-ha . \
--set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
--set artifactory-ha.database.user=artifactory \
--set artifactory-ha.database.password=password \
--set artifactory-ha.artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
--set artifactory-ha.artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
--set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
--set artifactory-ha.artifactory.masterKey=$MASTER_KEY
echo "*** IMPORTANT ****"
echo "export MASTER_KEY=$MASTER_KEY"
echo "export JOIN_KEY=$JOIN_KEY"
echo "*** SUCCESS ****"

4
Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helmupgrade.sh
View File

@@ -11,7 +11,7 @@ helm upgrade --install artifactory-ha . \
--set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
--set artifactory-ha.database.user=artifactory \
--set artifactory-ha.database.password=password \
--set artifactory-ha.artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
--set artifactory-ha.artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \
--set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
--set artifactory-ha.artifactory.masterKey=$MASTER_KEY \
--set artifactory-ha.databaseUpgradeReady=true

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

@@ -1,6 +1,6 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 4.2.0
digest: sha256:c5d4c457266ce8d7e0e8c6dcf326267c3ca4cbb8a03c81db68a8a0b45fde3d3e
generated: "2020-10-06T15:10:01.551465-07:00"
version: 4.4.1
digest: sha256:36d606673a7c0e6ae47e615c90d5df7e203c75e574da6d5166ed0ebf8bb8e44c
generated: "2020-10-22T12:12:43.277532-07:00"

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

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

4
Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml
View File

@@ -10,7 +10,7 @@ artifactory-ha:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.2-1
waitForDatabase: true
installerInfo: '{ "productId": "Openshift_artifactory-ha/{{ .Chart.Version }}", "features": [ { "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}" }, { "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0" }, { "featureId": "Platform/Openshift" }, { "featureId": "Partner/ACC-006983" }, { "featureId": "Channel/Openshift" } ] }'
artifactory:
@@ -19,7 +19,7 @@ artifactory-ha:
image:
registry: registry.connect.redhat.com
repository: jfrog/artifactory-pro
tag: 7.9.0
tag: 7.10.2-1
node:
replicaCount: 2
waitForPrimaryStartup:

4
Openshift4/operator/pipeline-operator/CHANGELOG.md
View File

@@ -1,5 +1,5 @@
# JFrog Openshift Xray Chart Changelog
All changes to this chart will be documented in this file.
## [1.1.1] Oct 9, 2020
* Operator version 1.1.1 Openshift RT version 7.9.0, Xray version 3.8.8, Pipelines version 1.8.0
## [1.0.0] Oct 23, 2020
* Operator version 1.0.0 Pipelines version 1.8.0

0
Openshift4/operator/pipeline-operator/bundle/1.1.1/manifests/openshiftpipeline.charts.helm.k8s.io.crd.yaml → Openshift4/operator/pipeline-operator/bundle/1.0.0/manifests/openshiftpipeline.charts.helm.k8s.io.crd.yaml
View File

8
Openshift4/operator/pipeline-operator/bundle/1.1.1/manifests/pipeline-operator.v1.1.1.clusterserviceversion.yaml → Openshift4/operator/pipeline-operator/bundle/1.0.0/manifests/pipeline-operator.v1.0.0.clusterserviceversion.yaml
View File

@@ -167,13 +167,13 @@ metadata:
capabilities: Seamless Upgrades
categories: Developer Tools,Integration & Delivery
certified: 'true'
containerImage: registry.connect.redhat.com/jfrog/pipelines-operator:1.8
containerImage: registry.connect.redhat.com/jfrog/pipelines-operator:1.8.1
createdAt: 2020-10-09 00:00:00+00:00
description: JFrog Pipeline Enterprise deploys Pipeline CI/CD Openshift (Requires Jfrog Artifactory)
repository: https://github.com/jfrog/JFrog-Cloud-Installers/tree/openshift4/Openshift4
support: JFrog
creationTimestamp: null
name: pipeline-operator.v1.1.1
name: pipeline-operator.v1.0.0
namespace: default
spec:
apiservicedefinitions: {}
@@ -349,7 +349,7 @@ spec:
value: registry.connect.redhat.com/jfrog/pipelines-vault-init:1.8.0
- name: RELATED_IMAGE_PIPELINE_VAULT_IMAGE_REPOSITORY
value: registry.connect.redhat.com/jfrog/pipelines-vault:1.8.0
image: registry.connect.redhat.com/jfrog/pipelines-operator:1.8
image: registry.connect.redhat.com/jfrog/pipelines-operator:1.8.1
imagePullPolicy: Always
name: pipeline-operator
resources: {}
@@ -512,7 +512,7 @@ spec:
maturity: alpha
provider:
name: JFrog
version: 1.1.1
version: 1.0.0
status:
certsLastUpdated: null
certsRotateAt: null

0
Openshift4/operator/pipeline-operator/bundle/1.1.1/metadata/annotations.yaml → Openshift4/operator/pipeline-operator/bundle/1.0.0/metadata/annotations.yaml
View File

2
Openshift4/operator/pipeline-operator/bundle/1.1.1/metadata/openshiftpipeline-operator.package.yaml → Openshift4/operator/pipeline-operator/bundle/1.0.0/metadata/openshiftpipeline-operator.package.yaml
View File

@@ -1,5 +1,5 @@
channels:
- currentCSV: pipeline-operator.v1.1.1
- currentCSV: pipeline-operator.v1.0.0
name: alpha
defaultChannel: ''
packageName: openshiftpipeline-operator

0
Openshift4/operator/pipeline-operator/bundle/1.1.1/tests/scorecard/config.yaml → Openshift4/operator/pipeline-operator/bundle/1.0.0/tests/scorecard/config.yaml
View File

5
Openshift4/operator/pipeline-operator/bundle/bundle-1.1.1.Dockerfile → Openshift4/operator/pipeline-operator/bundle/bundle-1.0.0.Dockerfile
View File

@@ -12,9 +12,8 @@ LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorfra
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
COPY 1.1.1/manifests /manifests/
COPY 1.1.1/metadata /metadata/
COPY 1.1.1/tests /tests/
COPY 1.0.0/manifests /manifests/
COPY 1.0.0/metadata /metadata/
LABEL com.redhat.openshift.versions="v4.5,v4.6"
LABEL com.redhat.delivery.operator.bundle=true
LABEL com.redhat.delivery.backport=true

6
Openshift4/operator/pipeline-operator/watches.yaml
View File

@@ -1,6 +1,6 @@
# Use the 'create api' subcommand to add watches to this file.
- group: charts.helm.k8s.io
version: v1alpha1
---
- version: v1alpha1
group: charts.helm.k8s.io
kind: OpenshiftPipelines
chart: helm-charts/openshift-pipelines
# +kubebuilder:scaffold:watch

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

@@ -1,6 +1,12 @@
# JFrog Openshift Xray Chart Changelog
All changes to this chart will be documented in this file.
## [1.1.2] Oct 23rd, 2020
* Deploying JFrog Xray 3.10.3 as an Operator into Openshift
## [1.1.1] Oct 6, 2020
* Bug Fixes
## [1.1.0] Oct 1, 2020
* Deploying JFrog Xray 3.8.8 as an Operator into Openshift

29
Openshift4/operator/xray-operator/bundle/1.1.2/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

463
Openshift4/operator/xray-operator/bundle/1.1.2/manifests/xray-operator.v1.1.2.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.2/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.2/metadata/openshiftxray-operator.package.yaml Normal file
View File

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

19
Openshift4/operator/xray-operator/bundle/bundle-1.1.2.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.2/manifests /manifests/
COPY 1.1.2/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
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

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

@@ -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

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

@@ -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

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

@@ -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

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.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"

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

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

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

@@ -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

8
Openshift4/operator/xray-operator/watches.yaml
View File

@@ -3,3 +3,11 @@
group: charts.helm.k8s.io
kind: OpenshiftXray
chart: helm-charts/openshift-xray
overrideValues:
xray.initContainerImage.override: $RELATED_IMAGE_XRAY_INIT_IMAGE_REPOSITORY
xray.server.image.override: $RELATED_IMAGE_XRAY_SERVER_IMAGE_REPOSITORY
xray.analysis.image.override: $RELATED_IMAGE_XRAY_ANALYSIS_IMAGE_REPOSITORY
xray.persist.image.override: $RELATED_IMAGE_XRAY_PERSIST_IMAGE_REPOSITORY
xray.indexer.image.override: $RELATED_IMAGE_XRAY_INDEXER_IMAGE_REPOSITORY
xray.router.image.override: $RELATED_IMAGE_XRAY_ROUTER_IMAGE_REPOSITORY
xray.rabbitmq-ha.image.override: $RELATED_IMAGE_XRAY_RABBITMQ_IMAGE_REPOSITORY