Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[jfrog-platform] 10.20.0 release #1934

Merged
merged 9 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/artifactory-cpp-ce/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JFrog Artifactory CE for C++ Chart Changelog
All changes to this chart will be documented in this file

## [107.90.15] - Feb 20, 2024
## [107.98.7] - Feb 20, 2024
* Updated `artifactory.installerInfo` content

## [107.80.0] - Feb 1, 2024
Expand Down
6 changes: 3 additions & 3 deletions stable/artifactory-cpp-ce/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: 7.90.15
appVersion: 7.98.7
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.90.15
version: 107.98.7
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
Expand All @@ -21,4 +21,4 @@ name: artifactory-cpp-ce
sources:
- https://github.com/jfrog/charts
type: application
version: 107.90.15
version: 107.98.7
4 changes: 2 additions & 2 deletions stable/artifactory-cpp-ce/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ postgresql:
enabled: true
router:
image:
tag: 7.118.3
tag: 7.135.1
initContainers:
image:
tag: 9.4.949.1716471857
tag: 9.4.1227
31 changes: 29 additions & 2 deletions stable/artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# JFrog Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.
All changes to this chart will be documented in this file

## [107.98.7] - Oct 02, 2024
* Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
* Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
* Enable Access workers integration when artifactory.worker.enabled is true
* Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
* Added support to bootstrap jfconnect custom certs to jfconnect trusted directory

## [107.96.0] - Sep 18, 2024
* Merged Artifactory sizing templates to a single file per size
* Added metadata and observability standalone image support

## [107.95.0] - Aug 26, 2024
* Adding missing annotations to primary Artifactory Service [GH-1862](https://github.com/jfrog/charts/pull/1862)

## [107.94.0] - Aug 14, 2024
* Fixed #Expose rtfs port only when it is enabled

## [107.93.0] - Aug 9, 2024
* Added support for worker via `artifactory.worker.enabled` flag
* Fixed creation of duplicate objects in statefulSet

## [107.92.0] - July 31, 2024
* Updating the example link for downloading the DB driver
* Adding dedicated ingress and service path for GRPC protocol

## [107.91.0] - July 18, 2024
* Remove X-JFrog-Override-Base-Url port when using default `443/80` ports

## [107.90.15] - July 18, 2024
* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
Expand All @@ -15,7 +43,6 @@ All changes to this chart will be documented in this file.
`access.javaOpts.other`
`access.resources`
`access.extraEnvironmentVariables`
* Updating the example link for downloading the DB driver
* Added Binary Provider recommendations

## [107.89.0] - May 30, 2024
Expand Down
8 changes: 5 additions & 3 deletions stable/artifactory-ha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
annotations:
artifactoryServiceVersion: 7.90.21
artifactoryServiceVersion: 7.98.6
metadataVersion: 7.90.0
observabilityVersion: 1.31.5
apiVersion: v2
appVersion: 7.90.15
appVersion: 7.98.7
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -23,4 +25,4 @@ name: artifactory-ha
sources:
- https://github.com/jfrog/charts
type: application
version: 107.90.15
version: 107.98.7
4 changes: 2 additions & 2 deletions stable/artifactory-ha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Below you will find the basic instructions for installing, uninstalling, and del
## Chart Details
This chart will do the following:

* Deploy Artifactory highly available cluster. 1 primary node and 2 member nodes.
* Deploy Artifactory highly available cluster. 3 primary nodes.
* Deploy a PostgreSQL database **NOTE:** For production grade installations it is recommended to use an external PostgreSQL
* Deploy an Nginx server

Expand Down Expand Up @@ -44,7 +44,7 @@ helm upgrade --install artifactory-ha jfrog/artifactory-ha --namespace artifacto
To apply the chart with recommended sizing configurations :
For small configurations :
```bash
helm upgrade --install artifactory-ha jfrog/artifactory-ha -f sizing/artifactory-small-extra-config.yaml -f sizing/artifactory-small.yaml --namespace artifactory-ha --create-namespace
helm upgrade --install artifactory-ha jfrog/artifactory-ha -f sizing/artifactory-small.yaml --namespace artifactory-ha --create-namespace
```

## Uninstalling Artifactory
Expand Down
5 changes: 5 additions & 0 deletions stable/artifactory-ha/files/binarystore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@
<bucketName>{{ .Values.artifactory.persistence.googleStorage.bucketName }}</bucketName>
<path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
<bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
{{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
<signedUrlExpirySeconds>true</signedUrlExpirySeconds>
{{- else }}
<signedUrlExpirySeconds>false</signedUrlExpirySeconds>
{{- end }}
</provider>
</config>
{{- end }}
Expand Down
12 changes: 11 additions & 1 deletion stable/artifactory-ha/files/nginx-artifactory-conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,22 @@ location / {
proxy_cookie_path ~*^/.* /;
proxy_pass {{ include "artifactory-ha.scheme" . }}://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalPort }}/;
{{- if .Values.nginx.service.ssloffload}}
{{- if .Values.nginx.service.ssloffloadForceHttps}}
proxy_set_header X-JFrog-Override-Base-Url https://$host;
proxy_set_header X-Forwarded-Proto https;
{{- else }}
proxy_set_header X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
{{- end }}
{{- else if or (eq (int .Values.nginx.https.internalPort) 80) (eq (int .Values.nginx.https.externalPort) 443)}}
proxy_set_header X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
{{- else }}
proxy_set_header X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host:$host_port;
proxy_set_header X-Forwarded-Port $server_port;
{{- end }}
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
{{- end }}
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
{{- if .Values.nginx.disableProxyBuffering}}
Expand Down
13 changes: 12 additions & 1 deletion stable/artifactory-ha/files/system.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@ router:
serviceRegistry:
insecure: {{ .Values.router.serviceRegistry.insecure }}
shared:
{{- if .Values.artifactory.coldStorage.enabled }}
{{- if .Values.artifactory.coldStorage.enabled }}
jfrogColdStorage:
coldInstanceEnabled: true
{{- end }}
{{- if .Values.artifactory.worker.enabled }}
featureToggler:
worker: true
{{- end }}
{{ tpl (include "artifactory.metrics" .) . }}
logging:
consoleLog:
enabled: {{ .Values.artifactory.consoleLog }}
extraJavaOpts: >
-Dartifactory.graceful.shutdown.max.request.duration.millis={{ mul .Values.artifactory.terminationGracePeriodSeconds 1000 }}
-Dartifactory.access.client.max.connections={{ .Values.access.tomcat.connector.maxThreads }}
{{- if .Values.artifactory.worker.enabled }}
-Dartifactory.workers.addon.support=true
{{- end }}
{{- with .Values.artifactory.primary.javaOpts }}
{{- if .corePoolSize }}
-Dartifactory.async.corePoolSize={{ .corePoolSize }}
Expand Down Expand Up @@ -107,6 +114,10 @@ access:
username: "{{ .Values.access.database.user }}"
password: "{{ .Values.access.database.password }}"
{{- end }}
{{- if .Values.artifactory.worker.enabled }}
worker:
enabled: true
{{- end }}
{{- if .Values.mc.enabled }}
mc:
enabled: true
Expand Down
44 changes: 0 additions & 44 deletions stable/artifactory-ha/sizing/artifactory-2xlarge-extra-config.yaml

This file was deleted.

49 changes: 41 additions & 8 deletions stable/artifactory-ha/sizing/artifactory-2xlarge.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
##############################################################
##############################################################################################
# The 2xlarge sizing
# This size is intended for very large organizations. It can be increased with adding replicas
##############################################################
# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
# hence this configuration will be overridden when enabling systemYamlOverride
##############################################################################################
splitServicesToContainers: true
artifactory:
primary:
Expand All @@ -21,22 +23,42 @@ artifactory:
# cpu: "20"
memory: 24Gi

javaOpts:
other: >
-XX:InitialRAMPercentage=40
-XX:MaxRAMPercentage=70
-Dartifactory.async.corePoolSize=200
-Dartifactory.async.poolMaxQueueSize=100000
-Dartifactory.http.client.max.total.connections=150
-Dartifactory.http.client.max.connections.per.route=150
-Dartifactory.access.client.max.connections=200
-Dartifactory.metadata.event.operator.threads=5
-XX:MaxMetaspaceSize=512m
-Djdk.nio.maxCachedBufferSize=1048576
-XX:MaxDirectMemorySize=1024m

tomcat:
connector:
maxThreads: 800
extraConfig: 'acceptCount="1200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'

database:
maxOpenConnections: 200

extraEnvironmentVariables:
- name: MALLOC_ARENA_MAX
value: "16"
- name : JF_SHARED_NODE_HAENABLED
value: "true"
- name: SKIP_WAIT_FOR_EXTERNAL_DB
value: "true"

router:
resources:
requests:
cpu: "1"
memory: 1Gi
limits:
# cpu: "6"
cpu: "2"
memory: 2Gi
limits:
# cpu: "12"
memory: 4Gi

frontend:
resources:
Expand All @@ -48,6 +70,8 @@ frontend:
memory: 1Gi

metadata:
database:
maxOpenConnections: 200
resources:
requests:
cpu: "1"
Expand All @@ -66,6 +90,15 @@ event:
memory: 500Mi

access:
tomcat:
connector:
maxThreads: 200
javaOpts:
other: >
-XX:InitialRAMPercentage=20
-XX:MaxRAMPercentage=60
database:
maxOpenConnections: 200
resources:
requests:
cpu: 1
Expand Down
44 changes: 0 additions & 44 deletions stable/artifactory-ha/sizing/artifactory-large-extra-config.yaml

This file was deleted.

Loading
Loading