Merge pull request #43 from jfrog/Update_fluentd_image

Adding new image to values file and changing env naming convention
jfrog · Feb 13, 2024 · f50be13 · f50be13
2 parents 4a4e740 + e1d62ed
commit f50be13
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 76 deletions.
diff --git a/README.md b/README.md
diff --git a/docker-build/Dockerenvfile.txt → docker-build/docker.env b/docker-build/Dockerenvfile.txt → docker-build/docker.env
diff --git a/helm/artifactory-ha-values.yaml b/helm/artifactory-ha-values.yaml
@@ -15,7 +15,7 @@ artifactory:
           name: volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:2.1"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.0"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"

diff --git a/helm/artifactory-values.yaml b/helm/artifactory-values.yaml
@@ -15,7 +15,7 @@ artifactory:
           name: artifactory-volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:2.1"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.0"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"

diff --git a/helm/jfrog_helm.env b/helm/jfrog_helm.env
@@ -0,0 +1,4 @@
+export DATADOG_API_KEY=DATADOG_API_KEY
+export JPD_URL=http://abc.jfrog.io
+export JPD_ADMIN_USERNAME=admin
+export COMMON_JPD=false
diff --git a/helm/xray-values.yaml b/helm/xray-values.yaml
@@ -19,7 +19,7 @@ common:
           name: data-volume
   customSidecarContainers: |
     - name: "xray-platform-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:2.1"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.0"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.xray.persistence.mountPath }}"

diff --git a/.env_jfrog → jfrog.env b/.env_jfrog → jfrog.env