From 9d869b52e4e33c6b449d461e752e9fe4bd9d223b Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:23:37 +0530 Subject: [PATCH 1/2] [jfrog-platform] 10.15.1 release --- stable/jfrog-platform/CHANGELOG.md | 3 +++ stable/jfrog-platform/Chart.yaml | 2 +- stable/jfrog-platform/templates/_helpers.tpl | 6 ++++-- stable/jfrog-platform/values.yaml | 13 ++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md index eea0a0e8a..f4d893d8b 100644 --- a/stable/jfrog-platform/CHANGELOG.md +++ b/stable/jfrog-platform/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Platform Chart Changelog (GA releases only) All changes to this chart will be documented in this file. +## [10.15.1] - Sep 15, 2023 +* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819) + ## [10.15.0] - Sep 12, 2023 **IMPORTANT** * Enabled `unifiedSecretInstallation` to true by default,which enables single unified secret holding all of each product secrets diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml index 34dac43ac..0669239f0 100644 --- a/stable/jfrog-platform/Chart.yaml +++ b/stable/jfrog-platform/Chart.yaml @@ -59,4 +59,4 @@ name: jfrog-platform sources: - https://github.com/jfrog/charts type: application -version: 10.15.0 +version: 10.15.1 diff --git a/stable/jfrog-platform/templates/_helpers.tpl b/stable/jfrog-platform/templates/_helpers.tpl index a84d63c84..8fdf0e4c2 100644 --- a/stable/jfrog-platform/templates/_helpers.tpl +++ b/stable/jfrog-platform/templates/_helpers.tpl @@ -172,7 +172,8 @@ Custom init container for Postgres setup name: {{ tpl .Values.database.secrets.user.name . }} key: {{ tpl .Values.database.secrets.user.key . }} {{- else if .Values.database.user }} - name: {{ .Chart.Name }}-unified-secret + {{- $chartFullName := printf "%s.fullname" .Chart.Name }} + name: {{ include $chartFullName . }}-database-creds key: db-user {{- end }} - name: DB_PASSWORD @@ -182,7 +183,8 @@ Custom init container for Postgres setup name: {{ tpl .Values.database.secrets.password.name . }} key: {{ tpl .Values.database.secrets.password.key . }} {{- else if .Values.database.password }} - name: {{ .Chart.Name }}-unified-secret + {{- $chartFullName := printf "%s.fullname" .Chart.Name }} + name: {{ include $chartFullName . }}-database-creds key: db-password {{- end }} - name: PGPASSWORD diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml index a08d44a24..cb496b40f 100644 --- a/stable/jfrog-platform/values.yaml +++ b/stable/jfrog-platform/values.yaml @@ -224,7 +224,7 @@ redis: artifactory: enabled: true unifiedUpgradeAllowed: true - installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.15.0-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' + installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.15.1-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' postgresql: enabled: false waitForDatabase: false @@ -238,7 +238,7 @@ artifactory: mc: enabled: true artifactory: - unifiedSecretInstallation: true + unifiedSecretInstallation: false # Note: For HA deployments, set replicaCount >1 (recommended 3) replicaCount: 1 migration: @@ -253,7 +253,7 @@ xray: enabled: true unifiedUpgradeAllowed: true xray: - unifiedSecretInstallation: true + unifiedSecretInstallation: false postgresql: enabled: false database: @@ -280,7 +280,7 @@ distribution: enabled: true unifiedUpgradeAllowed: true distribution: - unifiedSecretInstallation: true + unifiedSecretInstallation: false postgresql: enabled: false database: @@ -288,12 +288,11 @@ distribution: user: distribution password: distribution - insight: enabled: true unifiedUpgradeAllowed: true insightServer: - unifiedSecretInstallation: true + unifiedSecretInstallation: false postgresql: enabled: false database: @@ -319,7 +318,7 @@ pipelines: user: "apiuser" password: "pipeline" pipelines: - unifiedSecretInstallation: true + unifiedSecretInstallation: false msg: uiUserPassword: password redis: From fffa3465ffd9b37c57dd3dc83f68507f91e28bb2 Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:33:09 +0530 Subject: [PATCH 2/2] [artifactory] 107.68.8 chart release --- stable/artifactory-cpp-ce/CHANGELOG.md | 2 +- stable/artifactory-cpp-ce/Chart.yaml | 4 +- stable/artifactory-ha/CHANGELOG.md | 7 +++- stable/artifactory-ha/Chart.yaml | 2 +- stable/artifactory-ha/ci/small-values.yaml | 4 +- stable/artifactory-ha/ci/test-values.yaml | 2 +- stable/artifactory-ha/templates/NOTES.txt | 7 +--- .../artifactory-node-statefulset.yaml | 38 +++++++++---------- stable/artifactory-ha/values.yaml | 8 ++-- stable/artifactory-jcr/CHANGELOG.md | 2 +- stable/artifactory-jcr/Chart.yaml | 4 +- stable/artifactory-oss/CHANGELOG.md | 2 +- stable/artifactory-oss/Chart.yaml | 4 +- stable/artifactory/CHANGELOG.md | 4 ++ stable/artifactory/Chart.yaml | 2 +- stable/artifactory/ci/test-values.yaml | 2 +- stable/artifactory/templates/NOTES.txt | 7 +--- stable/artifactory/values.yaml | 8 ++-- 18 files changed, 55 insertions(+), 54 deletions(-) diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md index 27989aea8..0a0415dde 100644 --- a/stable/artifactory-cpp-ce/CHANGELOG.md +++ b/stable/artifactory-cpp-ce/CHANGELOG.md @@ -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.8] - Jul 20, 2023 * Disabled federation services when splitServicesToContainers=true ## [107.45.0] - Aug 25, 2022 diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml index be2047ec1..44a7b955b 100644 --- a/stable/artifactory-cpp-ce/Chart.yaml +++ b/stable/artifactory-cpp-ce/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 7.68.7 dependencies: - name: artifactory repository: file://charts/artifactory - version: 107.68.7 + version: 107.68.8 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.68.7 +version: 107.68.8 diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md index e246a354c..009fe7fe8 100644 --- a/stable/artifactory-ha/CHANGELOG.md +++ b/stable/artifactory-ha/CHANGELOG.md @@ -1,8 +1,13 @@ # JFrog Artifactory-ha Chart Changelog All changes to this chart will be documented in this file +## [107.68.8] - Sep 15, 2023 +* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819) +* 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 diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml index c57b3ddda..4fceafeb2 100644 --- a/stable/artifactory-ha/Chart.yaml +++ b/stable/artifactory-ha/Chart.yaml @@ -21,4 +21,4 @@ name: artifactory-ha sources: - https://github.com/jfrog/charts type: application -version: 107.68.7 +version: 107.68.8 diff --git a/stable/artifactory-ha/ci/small-values.yaml b/stable/artifactory-ha/ci/small-values.yaml index 72cd9a59a..501d357b9 100644 --- a/stable/artifactory-ha/ci/small-values.yaml +++ b/stable/artifactory-ha/ci/small-values.yaml @@ -16,7 +16,7 @@ artifactory: connector: maxThreads: 200 primary: - replicaCount: 2 + replicaCount: 1 resources: requests: memory: "4Gi" @@ -27,6 +27,8 @@ artifactory: javaOpts: xms: "4g" xmx: "6g" + node: + replicaCount: 2 access: database: maxOpenConnections: 80 diff --git a/stable/artifactory-ha/ci/test-values.yaml b/stable/artifactory-ha/ci/test-values.yaml index 7af7c2e0f..ec76512e7 100644 --- a/stable/artifactory-ha/ci/test-values.yaml +++ b/stable/artifactory-ha/ci/test-values.yaml @@ -4,7 +4,7 @@ artifactory: enabled: true fsGroupChangePolicy: "OnRootMismatch" masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - unifiedSecretInstallation: true + unifiedSecretInstallation: false persistence: enabled: false replicator: diff --git a/stable/artifactory-ha/templates/NOTES.txt b/stable/artifactory-ha/templates/NOTES.txt index d78841a21..277364908 100644 --- a/stable/artifactory-ha/templates/NOTES.txt +++ b/stable/artifactory-ha/templates/NOTES.txt @@ -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/ diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml index 490fcbd7c..1afbca140 100644 --- a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml +++ b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml @@ -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' @@ -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' @@ -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' @@ -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 }} @@ -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 }} @@ -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' @@ -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' @@ -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' @@ -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' @@ -603,7 +603,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' @@ -641,7 +641,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' @@ -671,7 +671,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' @@ -709,7 +709,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' @@ -747,7 +747,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' @@ -807,7 +807,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' @@ -845,7 +845,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' @@ -1078,7 +1078,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' @@ -1098,7 +1098,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' @@ -1119,7 +1119,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" diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml index 2883fbd51..52c6a8439 100644 --- a/stable/artifactory-ha/values.yaml +++ b/stable/artifactory-ha/values.yaml @@ -97,7 +97,7 @@ ingress: hosts: [] routerPath: / artifactoryPath: /artifactory/ - rtfsPath: /rtfs/ + rtfsPath: /artifactory/service/rtfs/ className: "" annotations: {} # kubernetes.io/ingress.class: nginx @@ -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 @@ -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 " 1. This is only supported in Artifactory 7.25.x (appVersions) and above. replicaCount: 1 # minAvailable: 1 @@ -1385,7 +1385,7 @@ federation: command: - sh - -c - - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/rtfs/sync/ping + - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/ping initialDelaySeconds: {{ if semverCompare "