Merge pull request #137 from jfrog/openshift4

Openshift4
This commit is contained in:
Vinay Aggarwal
2021-07-02 11:27:16 -07:00
committed by GitHub
48 changed files with 2372 additions and 110 deletions

View File

@@ -1,6 +1,11 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [107.19.4] - Jul01, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
## [107.18.6] - May21, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
## [4.13.0] - Apr 8, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5

View File

@@ -0,0 +1,6 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 107.19.4
digest: sha256:6598dd095f931651d4021c54f47b09c63ae378ae53af169f2f3fb89d622b3b2b
generated: "2021-07-01T20:49:38.4818846+05:30"

View File

@@ -1,5 +1,9 @@
apiVersion: v1
appVersion: 7.17.5
apiVersion: v2
appVersion: 7.19.4
dependencies:
- name: artifactory-ha
version: 107.19.4
repository: https://charts.jfrog.io/
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 +20,4 @@ name: openshift-artifactory-ha
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts
version: 4.13.0
version: 107.19.4

View File

@@ -1,6 +0,0 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 4.13.0
digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597
generated: "2021-04-15T01:24:29.2028211+05:30"

View File

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

View File

@@ -10,7 +10,7 @@ artifactory-ha:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:7.17.5-11
initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-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.17.5-11
tag: 7.19.4-1
node:
replicaCount: 2
waitForPrimaryStartup:

View File

@@ -1,6 +1,12 @@
# JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file.
## [103.25.1] Jul 01, 2021
* Updating to Xray chart version 103.25.1 and Xray app version 3.25.1
## [8.0.0] May 24, 2021
* Updating to Xray chart version 8.0.0 and Xray app version 3.23.0 & this release has major fix for rabbitmq
## [7.1.1] Mar 11, 2021
* Updating to Xray chart version 7.1.1 and Xray app version 3.18.1

View File

@@ -0,0 +1,6 @@
dependencies:
- name: xray
repository: https://charts.jfrog.io/
version: 103.25.1
digest: sha256:613f1445e6f5315c85fae4ab11f0acf0baeed12fd00698a3e749fe650844410c
generated: "2021-07-01T20:44:29.4805476+05:30"

View File

@@ -1,6 +1,10 @@
apiVersion: v1
appVersion: 3.18.1
apiVersion: v2
appVersion: 3.25.1
description: Universal component scan for security and license inventory and impact analysis
dependencies:
- name: xray
version: 103.25.1
repository: https://charts.jfrog.io/
sources:
- https://bintray.com/jfrog/product/xray/view
- https://github.com/jfrog/charts
@@ -13,4 +17,4 @@ maintainers:
- email: johnp@jfrog.com
name: John Peterson
name: openshift-xray
version: 7.1.1
version: 103.25.1

View File

@@ -1,6 +0,0 @@
dependencies:
- name: xray
repository: https://charts.jfrog.io/
version: 7.1.1
digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378
generated: "2021-04-28T23:47:11.7328972+05:30"

View File

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

43
Openshift4/helm/openshift-xray/values.yaml Normal file → Executable file
View File

@@ -11,13 +11,13 @@ xray:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.4-1
initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-1
common:
rabbitmq:
connectionConfigFromEnvironment: true
xrayUserId: "1000721035"
xrayGroupId: "1000721035"
xrayVersion: "3.18.1-1"
xrayVersion: "3.25.1-1"
customInitContainers: |
- name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}"
@@ -71,9 +71,8 @@ xray:
registry: registry.connect.redhat.com
repository: jfrog/xray-router
imagePullPolicy: IfNotPresent
tag: 3.18.1-1
rabbitmq-ha:
enabled: false
tag: 3.25.1-1
# RabbitMQ
## Configuration values for the rabbitmq dependency
## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md
@@ -82,13 +81,17 @@ xray:
replicaCount: 1
rbac:
create: true
image:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-rabbitmq
tag: 3.18.1-1
tag: 3.25.1-1
podSecurityContext:
fsGroup: 1000721001
runAsUser: 1000721001
runAsUser: 1000721001
auth:
username: xray
password: xray
@@ -100,6 +103,7 @@ xray:
## Enable encryption to rabbitmq
## ref: https://www.rabbitmq.com/ssl.html
##
tls:
enabled: false
failIfNoPeerCert: true
@@ -107,25 +111,10 @@ xray:
#caCertificate: |-
#serverCertificate: |-
#serverKey: |-
rabbitmq-ha:
enabled: false
replicaCount: 1
image:
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
tag: 3.17.2-1
rabbitmqEpmdPort: 4369
rabbitmqNodePort: 5672
rabbitmqManagerPort: 15672
rabbitmqUsername: guest
rabbitmqPassword: guest
managementUsername: management
managementPassword: management
initContainer:
enabled: false
securityContext:
fsGroup: 1000721035
runAsUser: 1000721035
runAsGroup: 1000721035
livenessProbe:
initialDelaySeconds: 120
periodSeconds: 10

View File

@@ -1,6 +1,12 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [1.1.13] - Jul 01, 2021
* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
## [1.1.12] - May 21, 2021
* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
## [1.1.11] - Apr 9, 2021
* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5

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

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

View File

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

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

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

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

View File

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

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

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

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

View File

@@ -1,6 +1,11 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [107.19.4] - Jul01, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
## [107.18.6] - May21, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
## [4.13.0] - Apr 8, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5

View File

@@ -0,0 +1,6 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 107.19.4
digest: sha256:6598dd095f931651d4021c54f47b09c63ae378ae53af169f2f3fb89d622b3b2b
generated: "2021-07-01T20:49:38.4818846+05:30"

View File

@@ -1,5 +1,9 @@
apiVersion: v1
appVersion: 7.17.5
apiVersion: v2
appVersion: 7.19.4
dependencies:
- name: artifactory-ha
version: 107.19.4
repository: https://charts.jfrog.io/
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 +20,4 @@ name: openshift-artifactory-ha
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts
version: 4.13.0
version: 107.19.4

View File

@@ -1,6 +0,0 @@
dependencies:
- name: artifactory-ha
repository: https://charts.jfrog.io/
version: 4.13.0
digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597
generated: "2021-04-15T01:24:29.2028211+05:30"

View File

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

View File

@@ -10,7 +10,7 @@ artifactory-ha:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:7.17.5-11
initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-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.17.5-11
tag: 7.19.4-1
node:
replicaCount: 2
waitForPrimaryStartup:

View File

@@ -1,6 +1,12 @@
# JFrog Openshift Xray Chart Changelog
All changes to this chart will be documented in this file.
## [2.0.4] Jul 01, 2021
* Deploying JFrog Xray 3.25.1 as an Operator into Openshift
## [2.0.3] May 24, 2021
* Deploying JFrog Xray 3.23.0 as an Operator into Openshift & has a major bug fix for rabbitmq pod not coming up when deleted
## [2.0.2] Mar 12, 2021
* Deploying JFrog Xray 3.18.1 as an Operator into Openshift

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

File diff suppressed because one or more lines are too long

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

View File

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

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

File diff suppressed because one or more lines are too long

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

View File

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

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

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

View File

@@ -1,6 +1,12 @@
# JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file.
## [103.25.1] Jul 01, 2021
* Updating to Xray chart version 103.25.1 and Xray app version 3.25.1
## [8.0.0] May 24, 2021
* Updating to Xray chart version 8.0.0 and Xray app version 3.23.0 & this release has major fix for rabbitmq
## [7.1.1] Mar 11, 2021
* Updating to Xray chart version 7.1.1 and Xray app version 3.18.1

View File

@@ -0,0 +1,6 @@
dependencies:
- name: xray
repository: https://charts.jfrog.io/
version: 103.25.1
digest: sha256:613f1445e6f5315c85fae4ab11f0acf0baeed12fd00698a3e749fe650844410c
generated: "2021-07-01T20:44:29.4805476+05:30"

View File

@@ -1,6 +1,10 @@
apiVersion: v1
appVersion: 3.18.1
apiVersion: v2
appVersion: 3.25.1
description: Universal component scan for security and license inventory and impact analysis
dependencies:
- name: xray
version: 103.25.1
repository: https://charts.jfrog.io/
sources:
- https://bintray.com/jfrog/product/xray/view
- https://github.com/jfrog/charts
@@ -13,4 +17,4 @@ maintainers:
- email: johnp@jfrog.com
name: John Peterson
name: openshift-xray
version: 7.1.1
version: 103.25.1

View File

@@ -1,6 +0,0 @@
dependencies:
- name: xray
repository: https://charts.jfrog.io/
version: 7.1.1
digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378
generated: "2021-04-28T22:48:55.7568567+05:30"

View File

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

View File

@@ -11,13 +11,13 @@ xray:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.4-1
initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-1
common:
rabbitmq:
connectionConfigFromEnvironment: true
xrayUserId: "1000721035"
xrayGroupId: "1000721035"
xrayVersion: "3.18.1-1"
xrayVersion: "3.25.1-1"
customInitContainers: |
- name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}"
@@ -71,9 +71,8 @@ xray:
registry: registry.connect.redhat.com
repository: jfrog/xray-router
imagePullPolicy: IfNotPresent
tag: 3.18.1-1
rabbitmq-ha:
enabled: false
tag: 3.25.1-1
# RabbitMQ
## Configuration values for the rabbitmq dependency
## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md
@@ -82,13 +81,17 @@ xray:
replicaCount: 1
rbac:
create: true
image:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-rabbitmq
tag: 3.18.1-1
tag: 3.25.1-1
podSecurityContext:
fsGroup: 1000721001
runAsUser: 1000721001
runAsUser: 1000721001
auth:
username: xray
password: xray
@@ -100,6 +103,7 @@ xray:
## Enable encryption to rabbitmq
## ref: https://www.rabbitmq.com/ssl.html
##
tls:
enabled: false
failIfNoPeerCert: true
@@ -107,25 +111,10 @@ xray:
#caCertificate: |-
#serverCertificate: |-
#serverKey: |-
rabbitmq-ha:
enabled: false
replicaCount: 1
image:
repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
tag: 3.17.2-1
rabbitmqEpmdPort: 4369
rabbitmqNodePort: 5672
rabbitmqManagerPort: 15672
rabbitmqUsername: guest
rabbitmqPassword: guest
managementUsername: management
managementPassword: management
initContainer:
enabled: false
securityContext:
fsGroup: 1000721035
runAsUser: 1000721035
runAsGroup: 1000721035
livenessProbe:
initialDelaySeconds: 120
periodSeconds: 10