Openshift Artifactory 7.10.2

2026-01-21 00:06:55 -06:00 · 2020-12-02 12:14:51 -08:00
parent 2526ffdc94
commit d5000ea319
19 changed files with 536 additions and 21 deletions
--- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [4.4.5] - Nov 20, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
+
 ## [4.4.1] - Oct 22, 2020
 * Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2

--- a/Openshift4/helm/openshift-artifactory-ha/requirements.lock
+++ b/Openshift4/helm/openshift-artifactory-ha/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
  repository: https://charts.jfrog.io/
-  version: 4.4.1
-digest: sha256:36d606673a7c0e6ae47e615c90d5df7e203c75e574da6d5166ed0ebf8bb8e44c
-generated: "2020-10-22T12:12:43.277532-07:00"
+  version: 4.4.5
+digest: sha256:f900fb1d8a57532b2cfa7c8f42b04c43c2a4cf0461b4a80413e68f5513aac0b0
+generated: "2020-11-20T17:53:59.279733-08:00"
--- a/Openshift4/helm/openshift-artifactory-ha/requirements.yaml
+++ b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
  - name: artifactory-ha
-    version: 4.4.1
+    version: 4.4.5
    repository: https://charts.jfrog.io/
--- a/Openshift4/helm/openshift-artifactory-ha/values.yaml
+++ b/Openshift4/helm/openshift-artifactory-ha/values.yaml
@@ -10,7 +10,7 @@ artifactory-ha:
    url: "OVERRIDE"
    user: "OVERRIDE"
    password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.2-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.6-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.10.2-1
+      tag: 7.10.6-1
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/helm/openshift-xray/CHANGELOG.md
+++ b/Openshift4/helm/openshift-xray/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [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

--- a/Openshift4/helm/openshift-xray/requirements.lock
+++ b/Openshift4/helm/openshift-xray/requirements.lock
@@ -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.4.2
+digest: sha256:dfc0365b4068892d8d1eeb5c6a1dc24a1e619f83648c9a4a3652ca64c3f1061e
+generated: "2020-11-20T18:01:00.3176-08:00"
--- a/Openshift4/helm/openshift-xray/requirements.yaml
+++ b/Openshift4/helm/openshift-xray/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
  - name: xray
-    version: 6.2.1
+    version: 6.4.2
    repository: https://charts.jfrog.io/
--- a/Openshift4/helm/openshift-xray/values.yaml
+++ b/Openshift4/helm/openshift-xray/values.yaml
@@ -2,9 +2,10 @@
 xray:
  unifiedUpgradeAllowed: true
  replicaCount: 1
-  xray:
+  global:
    masterKey: "OVERRIDE"
    joinKey: "OVERRIDE"
+  xray:
    consoleLog: false
    jfrogUrl: "OVERRIDE"
  postgresql:
@@ -17,7 +18,7 @@ xray:
  common:
    xrayUserId: "1000721035"
    xrayGroupId: "1000721035"
-    xrayVersion: "3.10.3-1"
+    xrayVersion: "3.11.2-1"
    customInitContainers: |
      - name: "prepare-uid-persistent-volume"
        image: "{{ .Values.initContainerImage }}"
@@ -71,13 +72,13 @@ xray:
      registry: registry.connect.redhat.com
      repository: jfrog/xray-router
      imagePullPolicy: IfNotPresent
-      tag: 3.10.3-1
+      tag: 3.11.2-1
  rabbitmq-ha:
    enabled: true
    replicaCount: 1
    image:
      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
-      tag: 3.10.3-1
+      tag: 3.11.2-1
    rabbitmqEpmdPort: 4369
    rabbitmqNodePort: 5672
    rabbitmqManagerPort: 15672
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/manifests/artifactory-ha-operator.v1.1.3.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/manifests/artifactory-ha-operator.v1.1.3.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/metadata/annotations.yaml
@@ -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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.3
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.3/tests/scorecard/config.yaml
@@ -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
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.3.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.3.Dockerfile
@@ -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.3/manifests /manifests/
+COPY 1.1.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
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [4.4.5] - Nov 20, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
+
 ## [4.4.1] - Oct 22, 2020
 * Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2

--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh
@@ -4,7 +4,8 @@
 # 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)
+NAMESPACE="default"
+POSTGRES=$(helm ls -n $NAMESPACE | grep postgres | wc -l)

 if [[ "$POSTGRES" =~ (0) ]]
 then
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
  repository: https://charts.jfrog.io/
-  version: 4.4.1
-digest: sha256:36d606673a7c0e6ae47e615c90d5df7e203c75e574da6d5166ed0ebf8bb8e44c
-generated: "2020-10-22T12:12:43.277532-07:00"
+  version: 4.4.5
+digest: sha256:f900fb1d8a57532b2cfa7c8f42b04c43c2a4cf0461b4a80413e68f5513aac0b0
+generated: "2020-11-20T17:53:59.279733-08:00"
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
  - name: artifactory-ha
-    version: 4.4.1
+    version: 4.4.5
    repository: https://charts.jfrog.io/
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml
@@ -10,7 +10,7 @@ artifactory-ha:
    url: "OVERRIDE"
    user: "OVERRIDE"
    password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.2-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.10.6-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.10.2-1
+      tag: 7.10.6-1
    node:
      replicaCount: 2
      waitForPrimaryStartup: