Skip to content

Commit

Permalink
Merge pull request #1853 from jfrog/jp-10.16.4
Browse files Browse the repository at this point in the history
[jfrog-platform] 10.16.4 release
  • Loading branch information
chukka authored Dec 21, 2023
2 parents 3e3e047 + 951dd7f commit 0e7ca35
Show file tree
Hide file tree
Showing 24 changed files with 300 additions and 67 deletions.
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.71.5] - Jul 20, 2023
## [107.71.9] - Jul 20, 2023
* Disabled federation services when splitServicesToContainers=true

## [107.45.0] - Aug 25, 2022
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.71.5
appVersion: 7.71.9
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.71.5
version: 107.71.9
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.71.5
version: 107.71.9
2 changes: 1 addition & 1 deletion stable/artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JFrog Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file

## [107.71.5] - Nov 15, 2023
## [107.71.9] - Nov 15, 2023
* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml
* Fixed - Artifactory primary service condition
Expand Down
4 changes: 2 additions & 2 deletions stable/artifactory-ha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 7.71.5
appVersion: 7.71.9
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -21,4 +21,4 @@ name: artifactory-ha
sources:
- https://github.com/jfrog/charts
type: application
version: 107.71.5
version: 107.71.9
2 changes: 1 addition & 1 deletion stable/artifactory-jcr/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JFrog Container Registry Chart Changelog
All changes to this chart will be documented in this file.

## [107.71.5] - Jul 20, 2023
## [107.71.9] - Jul 20, 2023
* Disabled federation services when splitServicesToContainers=true

## [107.45.0] - Aug 25, 2022
Expand Down
6 changes: 3 additions & 3 deletions stable/artifactory-jcr/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: 7.71.5
appVersion: 7.71.9
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.71.5
version: 107.71.9
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
Expand All @@ -22,4 +22,4 @@ name: artifactory-jcr
sources:
- https://github.com/jfrog/charts
type: application
version: 107.71.5
version: 107.71.9
2 changes: 1 addition & 1 deletion stable/artifactory-oss/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JFrog Artifactory OSS Chart Changelog
All changes to this chart will be documented in this file

## [107.71.5] - Jul 20, 2023
## [107.71.9] - Jul 20, 2023
* Disabled federation services when splitServicesToContainers=true

## [107.45.0] - Aug 25, 2022
Expand Down
6 changes: 3 additions & 3 deletions stable/artifactory-oss/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: 7.71.5
appVersion: 7.71.9
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.71.5
version: 107.71.9
description: JFrog Artifactory OSS
home: https://www.jfrog.com/artifactory/
icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png
Expand All @@ -20,4 +20,4 @@ name: artifactory-oss
sources:
- https://github.com/jfrog/charts
type: application
version: 107.71.5
version: 107.71.9
2 changes: 1 addition & 1 deletion stable/artifactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JFrog Artifactory Chart Changelog
All changes to this chart will be documented in this file.

## [107.71.5] - Oct 31, 2023
## [107.71.9] - Oct 31, 2023
* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml.

Expand Down
4 changes: 2 additions & 2 deletions stable/artifactory/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 7.71.5
appVersion: 7.71.9
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -21,4 +21,4 @@ name: artifactory
sources:
- https://github.com/jfrog/charts
type: application
version: 107.71.5
version: 107.71.9
4 changes: 3 additions & 1 deletion stable/distribution/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@
.project
.idea/
*.tmproj
OWNERS
OWNERS

tests/
10 changes: 9 additions & 1 deletion stable/distribution/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
# JFrog Distribution Chart Changelog
All changes to this project chart be documented in this file.

## [102.20.3] - Aug 29, 2023
## [102.21.3] - Nov 22, 2023
* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
* Removed default hardcoded javaOpts `-Xms2g -Xmx4g` from distribution.sh file

## [102.20.1] - Sep 18, 2023
* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
* Added NewRelic APM agent integration

## [102.20.0] - Aug 29, 2023
* Updated redis version tag to `7.2.0-debian-11-r2`
* Enabled `unifiedSecretInstallation` by default

Expand Down
4 changes: 2 additions & 2 deletions stable/distribution/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 2.20.3
appVersion: 2.21.3
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -19,4 +19,4 @@ name: distribution
sources:
- https://github.com/jfrog/charts
type: application
version: 102.20.3
version: 102.21.3
56 changes: 56 additions & 0 deletions stable/distribution/ci/newrelic-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
newRelic:
apm:
enabled: true
appName: "ci-test"
licenseKey: "123456789"
version: 8.6.0
logLevel: severe
downloadUrl: https://download.newrelic.com
downloadPath: newrelic/java-agent/newrelic-agent/{{ .Values.newRelic.apm.version }}
downloadFile: newrelic-agent-{{ .Values.newRelic.apm.version }}.jar

distribution:
jfrogUrl: http://artifactory.rt:8082
persistence:
enabled: false
resources:
requests:
memory: "1Gi"
cpu: "1"
limits:
memory: "3Gi"
cpu: "2"

postgresql:
postgresqlPassword: password
persistence:
enabled: false

redis:
persistence:
enabled: false
resources:
requests:
memory: "512Mi"
cpu: "1"
limits:
memory: "1Gi"
cpu: "1"

router:
resources:
requests:
memory: "100Mi"
cpu: "100m"
limits:
memory: "1Gi"
cpu: "1"

observability:
resources:
requests:
memory: "100Mi"
cpu: "100m"
limits:
memory: "1Gi"
cpu: "1"
2 changes: 1 addition & 1 deletion stable/distribution/ci/test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ redis:

distribution:
jfrogUrl: http://artifactory.rt:8082
unifiedSecretInstallation: true
unifiedSecretInstallation: false
persistence:
enabled: false
annotations:
Expand Down
129 changes: 129 additions & 0 deletions stable/distribution/templates/distribution-newrelic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{{- if .Values.newRelic.apm.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "distribution.fullname" . }}-newrelic-apm-config
labels:
app: {{ template "distribution.name" . }}
chart: {{ template "distribution.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
data:
newrelic.yml: |-
common: &default_settings
license_key: {{ .Values.newRelic.apm.licenseKey }}
agent_enabled: {{ .Values.newRelic.apm.enabled }}
app_name: {{ .Values.newRelic.apm.appName }}
high_security: false
enable_auto_app_naming: false
enable_auto_transaction_naming: true
audit_mode: false
log_level: {{ .Values.newRelic.apm.logLevel }}
log_file_count: 1
log_limit_in_kbytes: 100000
log_daily: false
log_file_path: {{ .Values.distribution.persistence.mountPath }}/log
log_file_name: newrelic_apm_agent.log
application_logging:
enabled: true
forwarding:
enabled: true
context_data:
enabled: false
metrics:
enabled: true
code_level_metrics:
enabled: true
max_stack_trace_lines: 30
attributes:
enabled: true
transaction_tracer:
enabled: true
transaction_threshold: apdex_f
record_sql: obfuscated
log_sql: false
stack_trace_threshold: 0.5
explain_enabled: true
explain_threshold: 0.5
top_n: 20
error_collector:
enabled: true
ignore_classes:
- "akka.actor.ActorKilledException"
ignore_status_codes: 404
transaction_events:
enabled: true
max_samples_stored: 2000
distributed_tracing:
enabled: true
exclude_newrelic_header: false
span_events:
enabled: true
max_samples_stored: 2000
attributes:
enabled: true
thread_profiler:
enabled: true
browser_monitoring:
auto_instrument: true
class_transformer:
com.newrelic.instrumentation.servlet-user:
enabled: false
com.newrelic.instrumentation.spring-aop-2:
enabled: false
com.newrelic.instrumentation.jdbc-resultset:
enabled: false
classloader_excludes:
groovy.lang.GroovyClassLoader$InnerLoader,
org.codehaus.groovy.runtime.callsite.CallSiteClassLoader,
com.collaxa.cube.engine.deployment.BPELClassLoader,
org.springframework.data.convert.ClassGeneratingEntityInstantiator$ObjectInstantiatorClassGenerator,
org.mvel2.optimizers.impl.asm.ASMAccessorOptimizer$ContextClassLoader,
gw.internal.gosu.compiler.SingleServingGosuClassLoader,
jfr:
enabled: false
audit_logging: false
labels:
# An example label
#label_name: label_value
security:
enabled: false
mode: IAST
validator_service_url: wss://csec.nr-data.net
agent:
enabled: false
detection:
rci:
enabled: true
rxss:
enabled: true
deserialization:
enabled: true
development:
<<: *default_settings
app_name: My Application (Development)
staging:
<<: *default_settings
app_name: My Application (Staging)
production:
<<: *default_settings
{{- end }}
Loading

0 comments on commit 0e7ca35

Please sign in to comment.