Bump up artifactory version to 7.77.7

jfrog · Mar 22, 2024 · 33acdf4 · 33acdf4
1 parent 49eb1e5
commit 33acdf4
Show file tree

Hide file tree

Showing 14 changed files with 567 additions and 13 deletions.
diff --git a/Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt-initcontainer b/Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt-initcontainer
@@ -1,5 +1,5 @@
 # The new image based on registry.access.redhat.com/ubi
-FROM registry.access.redhat.com/ubi8
+FROM registry.access.redhat.com/ubi9
 
 USER root
 

diff --git a/Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt7 b/Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt7
@@ -7,7 +7,7 @@ ARG ARTIFACTORY_BASE_VERSION
 FROM docker.bintray.io/jfrog/artifactory-pro:${ARTIFACTORY_BASE_VERSION} AS base
 
 # The new image based on registry.access.redhat.com/ubi
-FROM registry.access.redhat.com/ubi8
+FROM registry.access.redhat.com/ubi9
 
 LABEL name="JFrog Artifactory Pro" \
       description="JFrog Artifactory Pro image based on the Red Hat Universal Base Image." \

diff --git 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.
 
+## [107.71.5] -  Mar 22, 2024
+* Updating to latest jfrog/artifactory-ha helm chart version 107.77.7 artifactory version 7.77.7
+
 ## [107.71.5] -  Nov 22, 2023
 * Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5
 

diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 7.71.5
+appVersion: 7.77.7
 dependencies:
   - name: artifactory-ha
-    version: 107.71.5
+    version: 107.77.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.71.5
+version: 107.77.7
diff --git 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.71.5
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.7
   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.71.5
+      tag: 7.77.7
     node:
       replicaCount: 2
       waitForPrimaryStartup:

diff --git a/...erator/bundle/1.1.21/manifests/artifactory-ha-operator.v1.1.21.clusterserviceversion.yaml b/...erator/bundle/1.1.21/manifests/artifactory-ha-operator.v1.1.21.clusterserviceversion.yaml
diff --git a/...y-ha-operator/bundle/1.1.21/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/...y-ha-operator/bundle/1.1.21/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,41 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+     api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/78458
+  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
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+              properties:
+                cronSpec:
+                  type: string
+                image:
+                  type: string
+                replicas:
+                  type: integer
+status:
+  acceptedNames:
+    kind: ''
+    plural: ''
+  conditions: null
+  storedVersions: null
diff --git a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.21/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.21/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
diff --git a/...tifactory-ha-operator/bundle/1.1.21/metadata/openshiftartifactoryha-operator.package.yaml b/...tifactory-ha-operator/bundle/1.1.21/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.21
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
diff --git a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.21/tests/scorecard/config.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.21/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
+
diff --git a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.21.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.21.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.21/manifests /manifests/
+COPY 1.1.21/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=false
diff --git a/...rator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md b/...rator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
@@ -1,7 +1,10 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.71.5] -  Nov 22, 2023
+## [107.71.5] -  Mar 22, 2024
+* Updating to latest jfrog/artifactory-ha helm chart version 107.77.7 artifactory version 7.77.7
+
+## [107.71.5] -  Nov 22, 202
 * Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5
 
 ## [107.59.11] -  Jul 01, 2023

diff --git 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,8 +1,8 @@
 apiVersion: v2
-appVersion: 7.71.5
+appVersion: 7.77.7
 dependencies:
   - name: artifactory-ha
-    version: 107.71.5
+    version: 107.77.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.71.5
+version: 107.77.7
diff --git 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.71.5
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.7
   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.71.5
+      tag: 7.77.7
     node:
       replicaCount: 2
       waitForPrimaryStartup: