Merge pull request jfrog#1509 from jfrog/rt-7.27.3

[artifactory] 7.27.3 release
kenttannady · Sep 30, 2021 · 1ebfce7 · 1ebfce7
2 parents bd3f0b1 + 865c869
commit 1ebfce7
Show file tree

Hide file tree

Showing 64 changed files with 4,845 additions and 906 deletions.
diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
+## [107.27.3] - Sep 22, 2021
+* Bumping chart version to align with app version
+
 ## [107.25.7] - Sep 17, 2021
 * Bumping chart version to align with app version
 

diff --git a/stable/artifactory-cpp-ce/Chart.lock b/stable/artifactory-cpp-ce/Chart.lock
diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,23 +1,24 @@
 apiVersion: v2
-type: application
-name: artifactory-cpp-ce
-home: https://www.jfrog.com/artifactory/
-version: 107.25.7
-appVersion: 7.25.7
+appVersion: 7.27.3
 dependencies:
-  - name: artifactory
-    version: 107.25.7
-    repository: https://charts.jfrog.io/
+- name: artifactory
+  repository: file://charts/artifactory
+  version: 107.27.3
 description: JFrog Artifactory CE for C++
-sources:
-- https://github.com/jfrog/charts
+home: https://www.jfrog.com/artifactory/
+icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
 keywords:
 - artifactory
 - jfrog
 - container
 - registry
 - devops
+kubeVersion: '>= 1.14.0-0'
 maintainers:
-- name: Chart Maintainers at JFrog
-  email: [email protected]
-icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
+- email: [email protected]
+  name: Chart Maintainers at JFrog
+name: artifactory-cpp-ce
+sources:
+- https://github.com/jfrog/charts
+type: application
+version: 107.27.3
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,7 +1,26 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.25.6] - Aug 23, 2021
+## [107.27.3] - Sep 20, 2021
+* **Breaking change**
+* Aligned probe structure (moved probes variables under config block)
+* Added support for new probes(set to false by default)
+* Bugfix - Invalid format for `multiPartLimit,multipartElementSize,maxCacheSize` in binarystore.xml
+* Added missioncontrol container in artifactory
+* Dropped NET_RAW capability for the containers
+* Added resources to migration-artifactory init container
+* Added resources to all rt split containers
+* Updated router version to `7.25.1`
+* Added support for Ingress networking.k8s.io/v1/Ingress for k8s >=1.22
+* Added min kubeVersion ">= 1.14.0-0" in chart.yaml
+* Update alpine tag version to `3.14.2`
+* Update busybox tag version to `1.33.1`
+
+## [107.26.0] - Aug 20, 2021
+* Added Observability container (only when `splitServicesToContainers` is enabled)
+* Added min kubeVersion ">= 1.12.0-0" in chart.yaml
+
+## [107.25.0] - Aug 13, 2021
 * Updated readme of chart to point to wiki. Refer [Installing Artifactory](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory)
 * Added startupProbe and livenessProbe for RT-split containers
 * Updated router version to 7.24.1
@@ -10,7 +29,6 @@ All changes to this chart will be documented in this file.
 * Changed network policy to allow all ingress and egress traffic
 * Added Observability changes
 * Added support for global.versions.router (only when `splitServicesToContainers` is enabled)
-* Added min kubeVersion ">= 1.12.0-0" in chart.yaml
 
 ## [107.24.0] - July 27, 2021
 * Support global and product specific tags at the same time

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,24 +1,23 @@
 apiVersion: v2
-appVersion: 7.25.6
+appVersion: 7.27.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 10.3.18
-description: Universal Repository Manager supporting all major packaging formats,
-  build tools and CI servers.
+description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-ha/logo/artifactory-logo.png
 keywords:
 - artifactory
 - jfrog
 - devops
-kubeVersion: '>= 1.12.0-0'
+kubeVersion: '>= 1.14.0-0'
 maintainers:
 - email: [email protected]
   name: Chart Maintainers at JFrog
 name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.25.6
+version: 107.27.3
diff --git a/stable/artifactory-ha/ci/global-values.yaml b/stable/artifactory-ha/ci/global-values.yaml
@@ -40,6 +40,9 @@ artifactory:
      imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
      securityContext:
        allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
      command: ["sh","-c","echo 'Sidecar is running in local' >> /scriptslocal/sidecarlocal.txt; cat /scriptslocal/sidecarlocal.txt; while true; do sleep 30; done"]
      volumeMounts:
        - mountPath: "/scriptslocal"
@@ -98,6 +101,9 @@ global:
      imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
      securityContext:
        allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
      command: ["sh","-c","echo 'Sidecar is running in global' >> /scripts/sidecarglobal.txt; cat /scripts/sidecarglobal.txt; while true; do sleep 30; done"]
      volumeMounts:
        - mountPath: "/scripts"

diff --git a/stable/artifactory-ha/templates/_helpers.tpl b/stable/artifactory-ha/templates/_helpers.tpl
@@ -338,7 +338,56 @@ Resolve requiredServiceTypes value
   {{- end -}}
 {{- end -}}
 {{- if .Values.artifactory.replicator.enabled -}}
-{{- $requiredTypes = printf "%s,%s" $requiredTypes "jfxfer" -}}
+    {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfxfer" -}}
+{{- end -}}
+{{- if .Values.mc -}}
+  {{- if .Values.mc.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfmc" -}}
+  {{- end -}}
 {{- end -}}
 {{- $requiredTypes -}}
 {{- end -}}
+
+{{/*
+nginx scheme (http/https)
+*/}}
+{{- define "nginx.scheme" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- printf "%s" "http" -}}
+{{- else -}}
+{{- printf "%s" "https" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+nginx port (80/443) based on http/https enabled
+*/}}
+{{- define "nginx.port" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- .Values.nginx.http.internalPort -}}
+{{- else -}}
+{{- .Values.nginx.https.internalPort -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+artifactory liveness probe
+*/}}
+{{- define "artifactory-ha.livenessProbe" -}}
+{{- if .Values.newProbes -}}
+{{- printf "%s" "/router/api/v1/system/liveness" -}}
+{{- else -}}
+{{- printf "%s" "/router/api/v1/system/health" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+artifactory readiness probe
+*/}}
+{{- define "artifactory-ha.readinessProbe" -}}
+{{- if .Values.newProbes -}}
+{{- printf "%s" "/router/api/v1/system/readiness" -}}
+{{- else -}}
+{{- printf "%s" "/router/api/v1/system/health" -}}
+{{- end -}}
+{{- end -}}