diff --git a/Makefile b/Makefile index e65ba2796..3425dd16b 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,11 @@ endif # check for binaries HELM_CMD := $(shell command -v helm 2> /dev/null) KUBECTL_CMD := $(shell command -v kubectl 2> /dev/null) -KUBEVAL_CMD := $(shell command -v kubeval 2> /dev/null) +KUBECONFORM_CMD := $(shell command -v kubeconform 2> /dev/null) GCLOUD_CMD := $(shell command -v gcloud 2> /dev/null) .PHONY: check-cli -check-cli: check-helm check-kubectl check-kubeval +check-cli: check-helm check-kubectl check-kubeconform .PHONY: check-helm check-helm: @@ -34,10 +34,10 @@ ifndef KUBECTL_CMD $(error "$n$nNo kubectl command found! $n$nPlease download required kubectl binary.$n$n") endif -.PHONY: check-kubeval -check-kubeval: -ifndef KUBEVAL_CMD - $(error "$n$nNo kubeval command found! $n$nPlease install: brew tap instrumenta/instrumenta && brew install kubeval $n$n") +.PHONY: check-kubeconform +check-kubeconform: +ifndef KUBECONFORM_CMD + $(error "$n$nNo kubeconform command found! $n$nPlease install: brew install kubeconform $n$n") endif .PHONY: check-gcloud diff --git a/stable/catalog/CHANGELOG.md b/stable/catalog/CHANGELOG.md index a56b21377..655c1f83b 100644 --- a/stable/catalog/CHANGELOG.md +++ b/stable/catalog/CHANGELOG.md @@ -1,9 +1,12 @@ # JFrog Catalog Chart Changelog All changes to this chart will be documented in this file. +[101.28.1] - Dec 5, 2025 +* Add PodDisruptionBudget template + [101.28.0] - May 5, 2025 -Updated router version to 7.165.2 -Fix the issue where `router.serviceRegistry.insecure` is not being applied in the system yaml. +* Updated router version to 7.165.2 +*Fix the issue where `router.serviceRegistry.insecure` is not being applied in the system yaml. [101.0.0] - August 2, 2024 -Initial release \ No newline at end of file +* Initial release \ No newline at end of file diff --git a/stable/catalog/Chart.yaml b/stable/catalog/Chart.yaml index f8da73dc3..c2e2216f2 100644 --- a/stable/catalog/Chart.yaml +++ b/stable/catalog/Chart.yaml @@ -16,4 +16,4 @@ name: catalog sources: - https://github.com/jfrog/charts type: application -version: 101.28.0 +version: 101.28.1 diff --git a/stable/catalog/ci/default-values.yaml b/stable/catalog/ci/default-values.yaml new file mode 100644 index 000000000..c429ded65 --- /dev/null +++ b/stable/catalog/ci/default-values.yaml @@ -0,0 +1 @@ +jfrogUrl: http://rt-artifactory.rt:8082 diff --git a/stable/catalog/templates/deployment.yaml b/stable/catalog/templates/deployment.yaml index b221325df..56fee0665 100644 --- a/stable/catalog/templates/deployment.yaml +++ b/stable/catalog/templates/deployment.yaml @@ -84,7 +84,7 @@ spec: echo "Copy joinKey to {{ .Values.persistence.mountPath }}/etc/security"; mkdir -p {{ .Values.persistence.mountPath }}/etc/security; echo -n ${ARTIFACTORY_JOIN_KEY} > {{ .Values.persistence.mountPath }}/etc/security/join.key; - {{- end }} + {{- end }} {{- if or .Values.masterKey .Values.global.masterKey .Values.masterKeySecretName .Values.global.masterKeySecretName }} echo "Copy masterKey to {{ .Values.persistence.mountPath }}/etc/security"; mkdir -p {{ .Values.persistence.mountPath }}/etc/security; @@ -99,7 +99,7 @@ spec: secretKeyRef: name: {{ include "catalog.joinKeySecretName" . }} key: join-key - {{- end }} + {{- end }} {{- if or .Values.masterKey .Values.global.masterKey .Values.masterKeySecretName .Values.global.masterKeySecretName }} - name: ARTIFACTORY_MASTER_KEY valueFrom: @@ -296,6 +296,8 @@ spec: {{- if .Values.extraVolumes }} {{- toYaml .Values.extraVolumes | nindent 8 }} {{- end }} + {{- if .Values.persistence.size }} - name: data emptyDir: - sizeLimit: {{ .Values.persistence.size }} \ No newline at end of file + sizeLimit: "{{ .Values.persistence.size }}" + {{- end }} \ No newline at end of file diff --git a/stable/catalog/templates/pdb.yaml b/stable/catalog/templates/pdb.yaml new file mode 100644 index 000000000..ab5e86679 --- /dev/null +++ b/stable/catalog/templates/pdb.yaml @@ -0,0 +1,21 @@ +{{- if .Values.minAvailable -}} +{{- if semverCompare "/dev/null exit_status=$? @@ -2158,7 +2158,7 @@ catalog: enabled: true image: releases-docker.jfrog.io/postgres:15.6-alpine ## Change database connection details to external database. Bundled postgresql is not recomended for production use. - ## When using bundled postgresql, provide the same credentials as used by xray. + ## When using bundled postgresql, provide the same credentials as used by xray. ## Xray post upgrade hook will create the catalog db in the bundled postgresql. ## Catalog customInitContainers will wait for the database to be available before starting the catalog. (Only applicable for bundled postgresql) database: diff --git a/test/common.sh b/test/common.sh index c4ee49909..574e16bb4 100644 --- a/test/common.sh +++ b/test/common.sh @@ -57,16 +57,16 @@ install_helm() { fi } -install_kubeval() { - echo 'Installing kubeval...' +install_kubeconform() { + echo 'Installing kubeconform...' if [[ "${LOCAL_RUN}" = "true" ]] then - echo "Local run, not downloading kubeval cli..." + echo "Local run, not downloading kubeconform cli..." else - echo "CI run, downloading kubeval cli..." - curl -sSLo tmp/kubeval.tar.gz "https://github.com/instrumenta/kubeval/releases/download/$KUBEVAL_VERSION/kubeval-linux-amd64.tar.gz" - tar xf tmp/kubeval.tar.gz -C tmp && chmod +x tmp/kubeval - sudo mv tmp/kubeval /usr/local/bin/kubeval + echo "CI run, downloading kubeconform cli..." + curl -sSLo tmp/kubeconform.tar.gz "https://github.com/instrumenta/kubeconform/releases/download/$KUBECONFORM_VERSION/kubeconform-linux-amd64.tar.gz" + tar xf tmp/kubeconform.tar.gz -C tmp && chmod +x tmp/kubeconform + sudo mv tmp/kubeconform /usr/local/bin/kubeconform fi } diff --git a/test/lint-charts.sh b/test/lint-charts.sh index 04d48a968..f19aa4e33 100755 --- a/test/lint-charts.sh +++ b/test/lint-charts.sh @@ -52,15 +52,23 @@ validate_manifests() { rm -rf stable mkdir stable pwd - helm template "${REPO_ROOT}/${chart_name}" --output-dir stable --set distribution.jfrogUrl=http://artifactory-artifactory.rt:8082,missionControl.jfrogUrl=http://artifactory-artifactory.rt:8082,pipelines.jfrogUrl=http://artifactory-artifactory.rt:8082,pipelines.jfrogUrlUI=http://artifactory-artifactory.rt:8082,xray.jfrogUrl=http://artifactory-artifactory.rt:8082,postgresql.postgresqlPassword=password > /dev/null 2>&1 + helm template "${REPO_ROOT}/${chart_name}" --output-dir stable \ + --set distribution.jfrogUrl=http://artifactory-artifactory.rt:8082 \ + --set missionControl.jfrogUrl=http://artifactory-artifactory.rt:8082 \ + --set pipelines.jfrogUrl=http://artifactory-artifactory.rt:8082 \ + --set pipelines.jfrogUrlUI=http://artifactory-artifactory.rt:8082 \ + --set xray.jfrogUrl=http://artifactory-artifactory.rt:8082 \ + --set jfrogUrl=http://artifactory-artifactory.rt:8082 \ + --set postgresql.auth.password=password \ + --set rabbitmq.auth.password=rabbitmqpass > /dev/null 2>&1 TEMPLATE_FILES="${chart_name}/templates" - if [ -d "${TEMPLATE_FILES}" ] + if [ -d "${TEMPLATE_FILES}" ] then echo "------------------------------------------------------------------------------------------------------------------------" echo "==> Processing with default values..." echo "------------------------------------------------------------------------------------------------------------------------" # shellcheck disable=SC2086 - kubeval -d ${TEMPLATE_FILES} + kubeconform ${TEMPLATE_FILES} if [ -d "${REPO_ROOT}/${chart_name}/ci" ] then FILES="${REPO_ROOT}/${chart_name}/ci/*" @@ -72,9 +80,9 @@ validate_manifests() { rm -rf stable mkdir stable helm template "${REPO_ROOT}/${chart_name}" -f "$file" --output-dir stable > /dev/null 2>&1 - TEMPLATE_FILES="${chart_name}/templates/*" + TEMPLATE_FILES="${chart_name}/templates/*" # shellcheck disable=SC2086 - kubeval ${TEMPLATE_FILES} + kubeconform ${TEMPLATE_FILES} done fi fi @@ -86,7 +94,7 @@ validate_manifests() { main() { mkdir -p tmp - install_kubeval + install_kubeconform install_helm ## git_fetch # Lint helm charts