Updated RT & X-ray versions to 7.17.5 & 3.21.2 respectively

2026-01-21 08:06:57 -06:00 · 2021-04-15 01:55:27 +05:30
parent 619c67445e
commit 2e95a2e916
31 changed files with 1751 additions and 23 deletions
--- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [1.1.11] - Apr 9, 2021
+* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
+
 ## [1.1.4] - Dec 2, 2020
 * Updating Operator to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5

--- a/Openshift4/operator/artifactory-ha-operator/Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/Dockerfile
@@ -1,4 +1,5 @@
 # Build the manager binary
+
 FROM quay.io/operator-framework/helm-operator:v1.3.0
 LABEL name="JFrog Artifactory Enterprise Operator" \
      description="Openshift operator to deploy JFrog Artifactory Enterprise based on the Red Hat Universal Base Image." \
@@ -6,8 +7,10 @@ LABEL name="JFrog Artifactory Enterprise Operator" \
      summary="JFrog Artifactory Enterprise Operator" \
      com.jfrog.license_terms="https://jfrog.com/artifactory/eula/"

-COPY licenses/ /licenses
+COPY  licenses/ /licenses
 ENV HOME=/opt/helm
 COPY watches.yaml ${HOME}/watches.yaml
 COPY helm-charts  ${HOME}/helm-charts
 WORKDIR ${HOME}
+
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/artifactory-ha-operator.v1.1.11.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/artifactory-ha-operator.v1.1.11.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/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.11/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/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.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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.11
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/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.11.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.11.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.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.11/manifests /manifests/
+COPY 1.1.11/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/README.md
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/README.md
@@ -1,2 +0,0 @@
-## README
-Should use the latest openshift artifactory ha chart from the partnership artifactory 
--- 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,13 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+
+## [4.13.0] -  Apr 8, 2021
+* Updating to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
+
+## [4.10.0] -  Mar 18, 2021
+* Updating to latest jfrog/artifactory-ha helm chart version 4.10.0 artifactory version 7.16.3
+
 ## [4.9.3] - Mar 5, 2021
 * Fixing issues with prior versions of operators v1.1.7 and v1.1.8 which are broken
 * Updating to latest jfrog/artifactory helm chart version 4.9.3 artifactory version 7.15.4
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.15.3
+appVersion: 7.17.5
 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.9.1
+version: 4.13.0
--- 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.9.3
-digest: sha256:68ee44570afdf4537a708ab4e2a0466cc21ebbb196035b029cfd1ae193243d72
-generated: "2021-03-05T14:24:22.234216-08:00"
+  version: 4.13.0
+digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597
+generated: "2021-04-15T01:24:29.2028211+05:30"
--- 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.9.3
+    version: 4.13.0
    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.15.4-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.17.5-11
  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.15.4-1
+      tag: 7.17.5-11
    node:
      replicaCount: 2
      waitForPrimaryStartup: