Updated all changes for Artifactory 7.25.7 & xray 3.32.2

This commit is contained in:
anupteal
2021-09-20 21:18:03 +05:30
parent 6997cd9efb
commit 178a9a596b
31 changed files with 1181 additions and 38 deletions

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.14] - Sep 15, 2021
* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7
## [1.1.13] - Jul 01, 2021
* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4

View File

@@ -1,6 +1,6 @@
# Build the manager binary
FROM quay.io/operator-framework/helm-operator:v1.3.0
FROM quay.io/operator-framework/helm-operator:v1.9.0
LABEL name="JFrog Artifactory Enterprise Operator" \
description="Openshift operator to deploy JFrog Artifactory Enterprise based on the Red Hat Universal Base Image." \
vendor="JFrog" \

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.14
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.14/manifests /manifests/
COPY 1.1.14/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,9 @@
# JFrog Openshift Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
## [107.25.7] - Sep15, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7
## [107.19.4] - Jul01, 2021
* Updating to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4

View File

@@ -1,6 +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"
version: 107.25.7
digest: sha256:c607758dd06d19716f037d292e07e0c7ae05e3a8b139929bbce37cb4ba5200df
generated: "2021-09-16T20:22:38.7320828+05:30"

View File

@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 7.19.4
appVersion: 7.25.7
dependencies:
- name: artifactory-ha
version: 107.19.4
version: 107.25.7
repository: https://charts.jfrog.io/
description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
home: https://www.jfrog.com/artifactory/
@@ -20,4 +20,4 @@ name: openshift-artifactory-ha
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/jfrog/charts
version: 107.19.4
version: 107.25.7

View File

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

View File

@@ -1,6 +1,9 @@
# JFrog Openshift Xray Chart Changelog
All changes to this chart will be documented in this file.
## [2.0.5] Sep 15, 2021
* Deploying JFrog Xray 3.32.2 as an Operator into Openshift
## [2.0.4] Jul 01, 2021
* Deploying JFrog Xray 3.25.1 as an Operator into Openshift

View File

@@ -1,5 +1,5 @@
# Build the manager binary
FROM quay.io/operator-framework/helm-operator:v1.3.0
FROM quay.io/operator-framework/helm-operator:v1.9.0
LABEL name="JFrog Xray Enterprise Operator" \
description="Openshift operator to deploy JFrog Xray Enterprise based on the Red Hat Universal Base Image" \
vendor="JFrog" \

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.5
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.5/manifests /manifests/
COPY 2.0.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

View File

@@ -1,6 +1,9 @@
# JFrog Openshift Artifactory-Xray Chart Changelog
All changes to this chart will be documented in this file.
## [103.32.2] Sep 15, 2021
* Updating to Xray chart version 103.32.2 and Xray app version 3.32.2
## [103.25.1] Jul 01, 2021
* Updating to Xray chart version 103.25.1 and Xray app version 3.25.1

View File

@@ -1,6 +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"
version: 103.32.2
digest: sha256:f06bb4fa71dde8b10e033f3f2316e09cf40494a9810bd9bdf72eccf7c0223ea6
generated: "2021-09-16T20:25:33.0210356+05:30"

View File

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

View File

@@ -11,13 +11,13 @@ xray:
url: "OVERRIDE"
user: "OVERRIDE"
password: "OVERRIDE"
initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-1
initContainerImage: registry.connect.redhat.com/jfrog/init:7.25.7-2
common:
rabbitmq:
connectionConfigFromEnvironment: true
xrayUserId: "1000721035"
xrayGroupId: "1000721035"
xrayVersion: "3.25.1-1"
xrayVersion: "3.32.2-2"
customInitContainers: |
- name: "prepare-uid-persistent-volume"
image: "{{ .Values.initContainerImage }}"
@@ -71,7 +71,7 @@ xray:
registry: registry.connect.redhat.com
repository: jfrog/xray-router
imagePullPolicy: IfNotPresent
tag: 3.25.1-1
tag: 3.32.2-2
# RabbitMQ
## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
image:
registry: registry.connect.redhat.com
repository: jfrog/xray-rabbitmq
tag: 3.25.1-1
tag: 3.32.2-2
podSecurityContext:
fsGroup: 1000721001