Artifactory operator v1.1.10 and Xray operator v2.0.1 w/ bug fixes

2026-01-20 22:06:55 -06:00 · 2021-03-11 12:04:29 -08:00
parent 7441c85640
commit 73a067c921
20 changed files with 1142 additions and 12 deletions
--- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,10 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [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
+
 ## [4.9.1] - Feb 22, 2021
 * Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3

--- 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.9.1
-digest: sha256:1254089bfad8d6c4bbb984dedf835360de4cccb7423479cb69395c281b633041
-generated: "2021-02-22T21:21:36.5442553+05:30"
+  version: 4.9.3
+digest: sha256:68ee44570afdf4537a708ab4e2a0466cc21ebbb196035b029cfd1ae193243d72
+generated: "2021-03-05T14:24:22.234216-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.9.1
+    version: 4.9.3
    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.12.6-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.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.12.6-1
+      tag: 7.15.4-1
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/artifactory-ha-operator.v1.1.10.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/artifactory-ha-operator.v1.1.10.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/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.10/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/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.10/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.10
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/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.10.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.10.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.10/manifests /manifests/
+COPY 1.1.10/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,10 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [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
+
 ## [4.9.1] - Feb 22, 2021
 * Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3

--- 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.1
-digest: sha256:1254089bfad8d6c4bbb984dedf835360de4cccb7423479cb69395c281b633041
-generated: "2021-02-22T21:21:36.5442553+05:30"
+  version: 4.9.3
+digest: sha256:68ee44570afdf4537a708ab4e2a0466cc21ebbb196035b029cfd1ae193243d72
+generated: "2021-03-05T14:24:22.234216-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.9.1
+    version: 4.9.3
    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.3-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.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.15.3-1
+      tag: 7.15.4-1
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/operator/xray-operator/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [2.0.1] Mar 11th, 2021
+* Bug fix for Rabbitmq user id and group id in the operator not matching helm values
+
 ## [2.0.0] Feb 19th, 2021
 * BREAKING CHANGE - Rabbitmq ha deprecated for Rabbitmq

--- a/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
@@ -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
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/xray-operator.v2.0.1.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/xray-operator.v2.0.1.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/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: 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
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v2.0.1
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/bundle-2.0.1.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-2.0.1.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=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.1/manifests /manifests/
+COPY 2.0.1/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true