Merge pull request #2 from fastly/master

merge master to release
fastly · Feb 26, 2025 · b638d6c · b638d6c
2 parents c65c09b + d02ed79
commit b638d6c
Show file tree

Hide file tree

Showing 33 changed files with 207 additions and 63 deletions.
diff --git a/examples/terraform/README.md b/examples/terraform/README.md
@@ -11,4 +11,4 @@ Some of the repository examples use JFrog Artifactory as the remote backend (com
 To set up Terraform with Artifactory, follow the instructions in the [Terraform Artifactory Backend](https://jfrog.com/help/r/jfrog-artifactory-documentation/terraform-backend-repository-structure) documentation.
 
 ## Examples
-1. Create the needed [AWS infrastructure for running JFrog Artifactory and Xray in AWS](jfrog-platform-aws-install) using RDS, S3, and EKS. This uses the [JFrog Platform Helm Chart](https://github.com/jfrog/charts/tree/master/stable/jfrog-platform) to install Artifactory and Xray
+1. Create the needed [AWS infrastructure for running JFrog Artifactory and Xray in AWS](jfrog-platform-aws-install) using RDS, S3, and EKS. This uses the [JFrog Platform Helm Chart](https://github.com/jfrog/charts/tree/master/stable/jfrog-platform) to install Artifactory , Catalog, Curation, Xray and JAS
diff --git a/examples/terraform/jfrog-platform-aws-install/README.md b/examples/terraform/jfrog-platform-aws-install/README.md
@@ -1,5 +1,5 @@
 # JFrog Platform Installation in AWS with Terraform
-This example will prepare the AWS infrastructure and services required to run Artifactory and Xray (installed with the [jfrog-platform Helm Chart](https://github.com/jfrog/charts/tree/master/stable/jfrog-platform)) using Terraform:
+This example will prepare the AWS infrastructure and services required to run Artifactory , Catalog, Curation, Xray and JAS  (installed with the [jfrog-platform Helm Chart](https://github.com/jfrog/charts/tree/master/stable/jfrog-platform)) using Terraform:
 1. The AWS VPC
 2. RDS (PostgreSQL) as the database for each application
 2. S3 as the Artifactory object storage

diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,7 +1,11 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.104.7] - Dec 5, 2024
+## [107.104.10] - Feb 14, 2024
+* Fixed an issue by disabling a pro-only service (Onemodel)
+* Updated federation key to rtfs in cpp, jcr and oss chart
+
+## [107.103.0] - Dec 5, 2024
 * Removed obsolete values [GH-1932](https://github.com/jfrog/charts/pull/1932)
 
 ## [107.81.0] - Feb 20, 2024

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.104.7
+appVersion: 7.104.10
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.104.7
+  version: 107.104.10
 description: JFrog Artifactory CE for C++
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
@@ -21,4 +21,4 @@ name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.104.7
+version: 107.104.10
diff --git a/stable/artifactory-cpp-ce/values.yaml b/stable/artifactory-cpp-ce/values.yaml
@@ -73,6 +73,8 @@ artifactory:
   jfconnect:
     enabled: false
 
-  federation:
+  rtfs:
     enabled: false
 
+  onemodel:
+    enabled: false
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.104.7] - Feb 07, 2025
+## [107.104.10] - Feb 07, 2025
 * Added new RTFS service
 * Added new Topology service
 * Added new onemodel service
@@ -14,6 +14,8 @@ All changes to this chart will be documented in this file
 * Fixed `shared` block in system.yaml to include all properties
 * Fixed RTFS jfrogUrl issue for platform chart
 * Fixed disabling onemodel using `onemodel.enabled=false`
+* Removed unwanted database support from rtfs
+* Added hpa support for RTFS service
 
 ## [107.102.0] - Nov 26, 2024
 * Remove the Xms and Xmx with InitialRAMPercentage and MaxRAMPercentage if they are available in extra_java_options

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
-  artifactoryServiceVersion: 7.104.16
+  artifactoryServiceVersion: 7.104.18
   metadataVersion: 7.118.2
   observabilityVersion: 1.31.11
 apiVersion: v2
-appVersion: 7.104.7
+appVersion: 7.104.10
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -25,4 +25,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.104.7
+version: 107.104.10
diff --git a/stable/artifactory-ha/templates/_helpers.tpl b/stable/artifactory-ha/templates/_helpers.tpl
@@ -670,4 +670,13 @@ Resolve customVolumeMounts rtfs value
 {{- if .Values.rtfs.customVolumeMounts -}}
 {{- .Values.rtfs.customVolumeMounts -}}
 {{- end -}}
+{{- end -}}
+
+{{/*
+Resolve RTFS autoscalling metrics
+*/}}
+{{- define "rtfs.metrics" -}}
+{{- if .Values.rtfs.autoscaling.metrics -}}
+{{- .Values.rtfs.autoscaling.metrics -}}
+{{- end -}}
 {{- end -}}
diff --git a/stable/artifactory-ha/templates/rtfs-hpa.yaml b/stable/artifactory-ha/templates/rtfs-hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.rtfs.autoscaling.enabled }}
+  {{- if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+  {{- else }}
+apiVersion: autoscaling/v2beta2
+  {{- end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "rtfs.fullname" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "rtfs.fullname" . }}
+  minReplicas: {{ .Values.rtfs.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.rtfs.autoscaling.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.rtfs.autoscaling.targetCPUUtilizationPercentage }}
+      {{- if .Values.rtfs.autoscaling.metrics }}
+{{ tpl (include "rtfs.metrics" .) . | indent 4 }}
+      {{- end }}
+{{- end }}
diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -286,7 +286,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.149.0
+    tag: 7.149.1
     pullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
@@ -1971,15 +1971,23 @@ rtfs:
   replicaCount: 1
   internalRestPort: 8025
   apiContext: artifactory/service/rtfs
-  database:
-    type: "postgresql"
-    driver: "org.postgresql.Driver"
-    url: ""
-    username: ""
-    password: ""
   persistence:
     mountPath: "/var/opt/jfrog/federation"
     federationProperties: {}
+  ## Apply horizontal pod auto scaling on distribution pods
+  ## Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 3
+    targetCPUUtilizationPercentage: 70
+    metrics: |
+      # - type: Resource
+      #   resource:
+      #     name: memory
+      #     target:
+      #       type: Utilization
+      #       averageUtilization: 75  # Target memory usage is 75% of the allocated memory per pod
   ## @param federationProperties Configuration to be added to the config map, overriding Spring configuration.
   ## @param customFederationPropertiesConfig Specifies the name of a custom configMap to use instead of the default one.
   ## The name of the custom configMap will be initialized from the value of customFederationPropertiesConfig.

diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md
@@ -1,7 +1,11 @@
 # JFrog Container Registry Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.104.7] - Dec 5, 2024
+## [107.104.10] - Feb 14, 2024
+* Fixed an issue by disabling a pro-only service (Onemodel)
+* Updated federation key to rtfs in cpp, jcr and oss chart
+
+## [107.103.0] - Dec 5, 2024
 * Removed obsolete values [GH-1932](https://github.com/jfrog/charts/pull/1932)
 
 ## [107.81.0] - Feb 20, 2024

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.104.7
+appVersion: 7.104.10
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.104.7
+  version: 107.104.10
 description: JFrog Container Registry
 home: https://jfrog.com/container-registry/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-jcr/logo/jcr-logo.png
@@ -22,4 +22,4 @@ name: artifactory-jcr
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.104.7
+version: 107.104.10
diff --git a/stable/artifactory-jcr/values.yaml b/stable/artifactory-jcr/values.yaml
@@ -73,5 +73,8 @@ artifactory:
   jfconnect:
     enabled: false
 
-  federation:
+  rtfs:
     enabled: false
+
+  onemodel:
+    enabled: false
diff --git a/stable/artifactory-oss/CHANGELOG.md b/stable/artifactory-oss/CHANGELOG.md
@@ -1,7 +1,11 @@
 # JFrog Artifactory OSS Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.104.7] - Dec 5, 2024
+## [107.104.10] - Feb 14, 2024
+* Fixed an issue by disabling a pro-only service (Onemodel)
+* Updated federation key to rtfs in cpp, jcr and oss chart
+
+## [107.103.0] - Dec 5, 2024
 * Removed obsolete values [GH-1932](https://github.com/jfrog/charts/pull/1932)
 
 ## [107.81.0] - Feb 20, 2024

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.104.7
+appVersion: 7.104.10
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.104.7
+  version: 107.104.10
 description: JFrog Artifactory OSS
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png
@@ -20,4 +20,4 @@ name: artifactory-oss
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.104.7
+version: 107.104.10
diff --git a/stable/artifactory-oss/values.yaml b/stable/artifactory-oss/values.yaml
@@ -72,6 +72,8 @@ artifactory:
   jfconnect:
     enabled: false
 
-  federation:
+  rtfs:
     enabled: false
 
+  onemodel:
+    enabled: false
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.104.7] - Feb 07, 2025
+## [107.104.10] - Feb 17, 2025
 * Added new RTFS service
 * Added new Topology service
 * Added new Onemodel service
@@ -15,6 +15,9 @@ All changes to this chart will be documented in this file.
 * Fixed `shared` block in system.yaml to include all properties
 * Fixed RTFS jfrogUrl issue for platform chart
 * Fixed disabling onemodel using `onemodel.enabled=false`
+* Added a condition to enable onemodel only on pro chart
+* Removed unwanted database support from rtfs
+* Added hpa support for RTFS service
 
 ## [107.102.0] - Nov 26, 2024
 * Remove the Xms and Xmx with InitialRAMPercentage and MaxRAMPercentage if they are available in extra_java_options

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.104.7
+appVersion: 7.104.10
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.104.7
+version: 107.104.10
diff --git a/stable/artifactory/templates/_helpers.tpl b/stable/artifactory/templates/_helpers.tpl
@@ -635,4 +635,13 @@ Resolve RTFS customInitContainers value
 {{- if .Values.rtfs.customInitContainers -}}
 {{- .Values.rtfs.customInitContainers -}}
 {{- end -}}
+{{- end -}}
+
+{{/*
+Resolve RTFS autoscalling metrics
+*/}}
+{{- define "rtfs.metrics" -}}
+{{- if .Values.rtfs.autoscaling.metrics -}}
+{{- .Values.rtfs.autoscaling.metrics -}}
+{{- end -}}
 {{- end -}}
diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -806,7 +806,7 @@ spec:
 {{ tpl .Values.metadata.livenessProbe.config . | indent 10 }}
       {{- end }}
       {{- end }}
-      {{- if .Values.onemodel.enabled }}
+      {{- if and .Values.onemodel.enabled (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
       - name: {{ .Values.onemodel.name }}
         image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
         imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}

diff --git a/stable/artifactory/templates/rtfs-hpa.yaml b/stable/artifactory/templates/rtfs-hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.rtfs.autoscaling.enabled }}
+  {{- if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+  {{- else }}
+apiVersion: autoscaling/v2beta2
+  {{- end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  labels:
+    app: {{ template "artifactory.fullname" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "rtfs.fullname" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "rtfs.fullname" . }}
+  minReplicas: {{ .Values.rtfs.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.rtfs.autoscaling.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.rtfs.autoscaling.targetCPUUtilizationPercentage }}
+      {{- if .Values.rtfs.autoscaling.metrics }}
+{{ tpl (include "rtfs.metrics" .) . | indent 4 }}
+      {{- end }}
+{{- end }}
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -231,7 +231,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.149.0
+    tag: 7.149.1
     pullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
@@ -1885,15 +1885,23 @@ rtfs:
   replicaCount: 1
   internalRestPort: 8025
   apiContext: artifactory/service/rtfs
-  database:
-    type: "postgresql"
-    driver: "org.postgresql.Driver"
-    url: ""
-    username: ""
-    password: ""
   persistence:
     mountPath: "/var/opt/jfrog/federation"
     federationProperties: {}
+  ## Apply horizontal pod auto scaling on distribution pods
+  ## Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 3
+    targetCPUUtilizationPercentage: 70
+    metrics: |
+      # - type: Resource
+      #   resource:
+      #     name: memory
+      #     target:
+      #       type: Utilization
+      #       averageUtilization: 75  # Target memory usage is 75% of the allocated memory per pod
   ## @param federationProperties Configuration to be added to the config map, overriding Spring configuration.
   ## @param customFederationPropertiesConfig Specifies the name of a custom configMap to use instead of the default one.
   ## The name of the custom configMap will be initialized from the value of customFederationPropertiesConfig.

diff --git a/stable/catalog/CHANGELOG.md b/stable/catalog/CHANGELOG.md
@@ -1,5 +1,5 @@
 # JFrog Catalog Chart Changelog
 All changes to this chart will be documented in this file.
 
-[101.0.0] - August 2, 2024
+[101.13.0] - Feb 26, 2025
 Initial release