Skip to content

Commit

Permalink
Merge branch 'master' into pipe-1.44.5
Browse files Browse the repository at this point in the history
  • Loading branch information
oumkale authored Oct 3, 2023
2 parents 3cfcff6 + 3fe84c4 commit 3d5d8ec
Show file tree
Hide file tree
Showing 35 changed files with 123 additions and 107 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.68.7] - Jul 20, 2023
## [107.68.11] - 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.68.7
appVersion: 7.68.11
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.68.7
version: 107.68.11
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.68.7
version: 107.68.11
12 changes: 11 additions & 1 deletion stable/artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
# JFrog Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file

## [107.68.11] - Sep 20, 2023
* Fixed rtfs context
* Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)

## [107.68.8] - Sep 18, 2023
* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
* Removed unused `artifactory.javaOpts` from values.yaml
* Removed openshift condition check from NOTES.txt
* Fixed an issue with artifactory node replicaCount [GH-1808](https://github.com/jfrog/charts/issues/1808)

## [107.68.7] - Aug 28, 2023
* Enabled `unifiedSecretInstallation` as true by default
* Enabled `unifiedSecretInstallation` by default
* Removed unused `artifactory.javaOpts` from values.yaml

## [107.67.0] - Aug 28, 2023
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.68.7
appVersion: 7.68.11
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.68.7
version: 107.68.11
4 changes: 3 additions & 1 deletion stable/artifactory-ha/ci/small-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ artifactory:
connector:
maxThreads: 200
primary:
replicaCount: 2
replicaCount: 1
resources:
requests:
memory: "4Gi"
Expand All @@ -27,6 +27,8 @@ artifactory:
javaOpts:
xms: "4g"
xmx: "6g"
node:
replicaCount: 2
access:
database:
maxOpenConnections: 80
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory-ha/ci/test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ artifactory:
enabled: true
fsGroupChangePolicy: "OnRootMismatch"
masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
unifiedSecretInstallation: true
unifiedSecretInstallation: false
persistence:
enabled: false
replicator:
Expand Down
7 changes: 1 addition & 6 deletions stable/artifactory-ha/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,8 @@ echo ${DB_PASSWORD}

SETUP:
1. Get the Artifactory IP and URL
{{printf "\n" }}
{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints" -}}

NOTE: You are installing Artifactory in Openshift Environment.
Nginx service is not available with this installation. If required, you can set the value for ingress in values.yaml.

{{- else if contains "NodePort" .Values.nginx.service.type }}
{{- if contains "NodePort" .Values.nginx.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "artifactory-ha.nginx.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT/
Expand Down
41 changes: 22 additions & 19 deletions stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
image: "{{ .Values.initContainerImage }}"
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- 'bash'
Expand Down Expand Up @@ -133,7 +133,7 @@ spec:
image: "{{ .Values.initContainerImage }}"
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- 'bash'
Expand All @@ -156,7 +156,7 @@ spec:
- name: 'copy-system-configurations'
image: '{{ .Values.initContainerImage }}'
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -227,7 +227,7 @@ spec:
- name: copy-custom-certificates
image: "{{ .Values.initContainerImage }}"
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
resources:
{{ toYaml .Values.initContainers.resources | indent 10 }}
Expand All @@ -247,7 +247,7 @@ spec:
- name: copy-circle-of-trust-certificates
image: "{{ .Values.initContainerImage }}"
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
resources:
{{ toYaml .Values.initContainers.resources | indent 10 }}
Expand Down Expand Up @@ -289,7 +289,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -429,7 +429,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "router") }}
imagePullPolicy: {{ .Values.router.image.imagePullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -474,7 +474,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -514,7 +514,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -585,6 +585,9 @@ spec:
{{ tpl (toYaml .) $ | indent 8 }}
{{- end }}
volumeMounts:
{{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
{{- end }}
- name: volume
mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
resources:
Expand All @@ -603,7 +606,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -641,7 +644,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -671,7 +674,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -709,7 +712,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -747,7 +750,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -807,7 +810,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -845,7 +848,7 @@ spec:
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- '/bin/bash'
Expand Down Expand Up @@ -1078,7 +1081,7 @@ spec:
- name: {{ . | replace "_" "-" | replace "." "-" }}
image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "logger") }}
{{- if $.Values.containerSecurityContext.enabled }}
securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- 'sh'
Expand All @@ -1098,7 +1101,7 @@ spec:
- name: {{ . | replace "_" "-" | replace "." "-" }}
image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "logger") }}
{{- if $.Values.containerSecurityContext.enabled }}
securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
command:
- 'sh'
Expand All @@ -1119,7 +1122,7 @@ spec:
image: "{{ .Values.filebeat.image.repository }}:{{ .Values.filebeat.image.version }}"
imagePullPolicy: {{ .Values.filebeat.image.pullPolicy }}
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
{{- end }}
args:
- "-e"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,9 @@ spec:
{{ tpl (toYaml .) $ | indent 8 }}
{{- end }}
volumeMounts:
{{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
{{- end }}
- name: volume
mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
resources:
Expand Down
8 changes: 4 additions & 4 deletions stable/artifactory-ha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ingress:
hosts: []
routerPath: /
artifactoryPath: /artifactory/
rtfsPath: /rtfs/
rtfsPath: /artifactory/service/rtfs/
className: ""
annotations: {}
# kubernetes.io/ingress.class: nginx
Expand Down Expand Up @@ -324,7 +324,7 @@ artifactory:
## root certificates added will be copied to $JFROG_HOME/artifactory/var/etc/access/keys/trusted folder.
circleOfTrustCertificatesSecret:
# unifiedSecretInstallation flag enables single unified secret holding all the artifactory-ha secrets
unifiedSecretInstallation: true
unifiedSecretInstallation: false
image:
registry: releases-docker.jfrog.io
repository: jfrog/artifactory-pro
Expand Down Expand Up @@ -1523,7 +1523,7 @@ federation:
command:
- sh
- -c
- curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/rtfs/sync/ping
- curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/ping
initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
failureThreshold: 5
timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
Expand All @@ -1536,7 +1536,7 @@ federation:
command:
- sh
- -c
- curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/rtfs/sync/ping
- curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/ping
initialDelaySeconds: 30
failureThreshold: 90
periodSeconds: 5
Expand Down
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.68.7] - Jul 20, 2023
## [107.68.11] - 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.68.7
appVersion: 7.68.11
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.68.7
version: 107.68.11
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.68.7
version: 107.68.11
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.68.7] - Jul 20, 2023
## [107.68.11] - 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.68.7
appVersion: 7.68.11
dependencies:
- name: artifactory
repository: file://charts/artifactory
version: 107.68.7
version: 107.68.11
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.68.7
version: 107.68.11
8 changes: 8 additions & 0 deletions stable/artifactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# JFrog Artifactory Chart Changelog
All changes to this chart will be documented in this file.

## [107.68.11] - Sep 20, 2023
* Fixed rtfs context
* Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)

## [107.68.8] - Sep 18, 2023
* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
* Removed openshift condition check from NOTES.txt

## [107.68.7] - Aug 28, 2023
* Enabled `unifiedSecretInstallation` by default

Expand Down
Loading

0 comments on commit 3d5d8ec

Please sign in to comment.