use onprem images (#1)

kubeshop · Jul 18, 2024 · 16b08c0 · 16b08c0
1 parent 9125371
commit 16b08c0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/charts/tracetest-agent-operator/templates/deployment.yaml b/charts/tracetest-agent-operator/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: {{ include "tracetest-agent-operator.fullname" . }}
       containers:
         - name: tracetestcloud
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+          image: "{{ $.Values.image.base }}{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
           env:
           - name: TRACETEST_NATS_ENDPOINT
             valueFrom:

diff --git a/charts/tracetest-agent-operator/values.yaml b/charts/tracetest-agent-operator/values.yaml
@@ -38,6 +38,4 @@ deployment:
       memory: 256Mi
 
 image:
-  repository: ghcr.io/kubeshop/tracetest-agent-operator
-  tag: v1.4.3
-
+  repository: kubeshop/tracetest-agent-operator
diff --git a/charts/tracetest-cloud/templates/deployment.yaml b/charts/tracetest-cloud/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: default
       containers:
         - name: tracetestcloud
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+          image: "{{ $.Values.image.base }}{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
           env:
             # Variables defined as config maps
             - name: AGENT_HOST
@@ -188,6 +188,11 @@ spec:
                 secretKeyRef:
                   name: {{ include "tracetest-cloud.fullname" . }}-secrets
                   key: SEGMENTIO_WRITE_KEY
+            - name: TRACETEST_LICENSE
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "tracetest-cloud.fullname" . }}-secrets
+                  key: LICENSE
           imagePullPolicy: Always
           resources:
             {{- toYaml .Values.deployment.resources | nindent 12 }}

diff --git a/charts/tracetest-cloud/templates/secret.yaml b/charts/tracetest-cloud/templates/secret.yaml
@@ -12,3 +12,4 @@ data:
   SENDGRID_API_KEY: {{ .Values.config.sendgridApiKey | b64enc }}
   HUBSPOT_API_KEY: {{ .Values.config.hubspotApiKey | b64enc }}
   SEGMENTIO_WRITE_KEY: {{ .Values.config.segmentWriteKey | b64enc }}
+  LICENSE: {{ .Values.config.license | b64enc }}
diff --git a/charts/tracetest-cloud/values.yaml b/charts/tracetest-cloud/values.yaml
@@ -81,14 +81,14 @@ deployment:
       memory: 256Mi
 
 image:
-  repository: ghcr.io/kubeshop/tracetest-cloud
-  # tag: v1.2.0
+  repository: kubeshop/tracetest-cloud
 
 config:
   sendgridApiKey: some-value
   githubCredential: some-credential-string
   hubspotApiKey: some-value
   segmentWriteKey: some-value
+  license: your-license-here
 
   telemetry:
     enabled: false

diff --git a/charts/tracetest-core/Chart.yaml b/charts/tracetest-core/Chart.yaml
@@ -20,4 +20,4 @@ version: v1.7.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: v1.1.0
+appVersion: v1.4.0
diff --git a/charts/tracetest-core/templates/deployment.yaml b/charts/tracetest-core/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ $.Chart.Name }}
-          image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
+          image: "{{ $.Values.image.base }}{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
           env:
             - name: TRACETEST_POSTGRES_HOST
               valueFrom:
@@ -71,6 +71,11 @@ spec:
               value: ""
             - name: TRACETEST_SERVER_TELEMETRY_SERVICE_NAME
               value: "core-{{ .name }}"
+            - name: TRACETEST_LICENSE
+              valueFrom:
+                secretKeyRef:
+                  name: oss-secrets
+                  key: license
             {{- range $key, $value := .env }}
             - name: {{ $key }}
               value: "{{ $value }}"

diff --git a/charts/tracetest-core/templates/secret.yaml b/charts/tracetest-core/templates/secret.yaml
@@ -23,3 +23,4 @@ type: Opaque
 data:
   tracetestAnalyticsServerKey: {{ .Values.config.tracetestAnalyticsServerKey | b64enc }}
   tracetestSecurityEncryptionKey: {{ .Values.config.tracetestSecurityEncryptionKey | b64enc }}
+  license: {{ .Values.config.license | b64enc }}
diff --git a/charts/tracetest-core/values.yaml b/charts/tracetest-core/values.yaml
@@ -19,6 +19,7 @@ global:
 config:
   tracetestAnalyticsServerKey: some-value
   tracetestSecurityEncryptionKey: some-value
+  license: your-license-here
   profiler:
     enabled: false
     samplingRate: 50
@@ -30,9 +31,8 @@ server:
 
 
 image:
-  repository: ghcr.io/kubeshop/tracetest-core
+  repository: kubeshop/tracetest-core
   tag: v1.5.0-rc.3
-  pullPolicy: IfNotPresent
 
 
 deployments: