fix private repos

README.md

@@ -1,2 +1 @@
 # tracetest-cloud-charts
-

charts/tracetest-agent-operator/templates/configmap.yaml

@@ -10,5 +10,4 @@ data:
   TRACETEST_TARGET_NAMESPACE: "{{ .Values.config.targetNamespace }}"
   TRACETEST_TARGET_SERVER: "{{ .Values.config.targetServer }}"
   TRACETEST_TARGET_DOMAIN: "{{ .Values.config.targetDomain }}"
-  TRACETEST_TRACING_COLLECTORENDPOINT: "collector-opentelemetry-collector.otel:4317"
-  # TRACETEST_TRACING_COLLECTORENDPOINT: ""
+  TRACETEST_TRACING_COLLECTORENDPOINT: ""

charts/tracetest-agent-operator/templates/deployment.yaml

@@ -62,3 +62,7 @@ spec:
           imagePullPolicy: Always
           resources:
             {{- toYaml .Values.deployment.resources | nindent 12 }}
+      {{- if $.Values.global.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ $.Values.global.imagePullSecret }}
+      {{- end }}

charts/tracetest-auth/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/tracetest-auth/templates/_helpers.tpl

@@ -41,3 +41,22 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "tracetest-auth.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "tracetest-auth.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "tracetest-auth.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "tracetest-auth.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

charts/tracetest-auth/templates/configmap.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: keto-custom-config
   labels:
-    {{- include "ory-kratos.labels" . | nindent 4 }}
+    {{- include "tracetest-auth.labels" . | nindent 4 }}
 data:
   {{- range $path, $bytes := .Files.Glob "config/keto/*" }}
   {{ base $path }}: |-
@@ -15,11 +15,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: keto-custom-config
+  name: kratos-custom-config
   labels:
-    {{- include "ory-kratos.labels" . | nindent 4 }}
+    {{- include "tracetest-auth.labels" . | nindent 4 }}
 data:
-  {{- range $path, $bytes := .Files.Glob "config/kratos*" }}
+  {{- range $path, $bytes := .Files.Glob "config/kratos/*" }}
   {{ base $path }}: |-
     {{ $.Files.Get $path | nindent 4 }}
   {{- end }}

charts/tracetest-cloud/templates/_helpers.tpl

@@ -64,6 +64,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "tracetest-cloud.selectorLabels" -}}
+app.kubernetes.io/package: tracetest
 app.kubernetes.io/name: {{ include "tracetest-cloud.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

charts/tracetest-cloud/templates/deployment.yaml

@@ -209,3 +209,7 @@ spec:
             httpGet:
               path: /health
               port: cloud-api-http
+    {{- if $.Values.global.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ $.Values.global.imagePullSecret }}
+    {{- end }}

charts/tracetest-cloud/templates/ingressroute.yaml

@@ -1,63 +1,63 @@
-# ---
-# apiVersion: traefik.io/v1alpha1
-# kind: Middleware
-# metadata:
-#   name: {{ include "tracetest-cloud.fullname" . }}-stripprefix
-# spec:
-#   stripPrefix:
-#     prefixes:
-#       - /api
-# ---
-# apiVersion: traefik.io/v1alpha1
-# kind: IngressRoute
-# metadata:
-#   name: {{ include "tracetest-cloud.fullname" . }}
-# spec:
-#   entryPoints:
-#     - websecure
-#   routes:
-#   - kind: Rule
-#     match: Host(`{{ .Values.config.apiUrl }}`)
-#     middlewares:
-#     - name: {{ include "tracetest-cloud.fullname" . }}-stripprefix
-#     services:
-#     - kind: Service
-#       name: {{ include "tracetest-cloud.fullname" . }}
-#       passHostHeader: true
-#       port: cloud-api-http
-# ---
-# apiVersion: traefik.io/v1alpha1
-# kind: IngressRoute
-# metadata:
-#   name: control-plane
-# spec:
-#   entryPoints:
-#     - websecure
-#   routes:
-#   - kind: Rule
-#     match: Host(`{{ .Values.config.apiUrl }}`) && Headers(`Content-Type`, `application/grpc`)
-#     services:
-#     - kind: Service
-#       name: {{ include "tracetest-cloud.fullname" . }}
-#       passHostHeader: true
-#       port: control-plane
-#       scheme: h2c
+---
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{ include "tracetest-cloud.fullname" . }}-stripprefix
+spec:
+  stripPrefix:
+    prefixes:
+      - /api
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: {{ include "tracetest-cloud.fullname" . }}
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - kind: Rule
+    match: Host(`{{ .Values.config.apiUrl }}`)
+    middlewares:
+    - name: {{ include "tracetest-cloud.fullname" . }}-stripprefix
+    services:
+    - kind: Service
+      name: {{ include "tracetest-cloud.fullname" . }}
+      passHostHeader: true
+      port: cloud-api-http
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: control-plane
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - kind: Rule
+    match: Host(`{{ .Values.config.apiUrl }}`) && Headers(`Content-Type`, `application/grpc`)
+    services:
+    - kind: Service
+      name: {{ include "tracetest-cloud.fullname" . }}
+      passHostHeader: true
+      port: control-plane
+      scheme: h2c
 
 
-# ---
-# apiVersion: traefik.io/v1alpha1
-# kind: IngressRoute
-# metadata:
-#   name: control-plane-custom-port
-# spec:
-#   entryPoints:
-#     - controlplane
-#   routes:
-#   - kind: Rule
-#     match: Host(`{{ .Values.config.apiUrl }}`)
-#     services:
-#     - kind: Service
-#       name: {{ include "tracetest-cloud.fullname" . }}
-#       passHostHeader: true
-#       port: control-plane
-#       scheme: h2c
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: control-plane-custom-port
+spec:
+  entryPoints:
+    - controlplane
+  routes:
+  - kind: Rule
+    match: Host(`{{ .Values.config.apiUrl }}`)
+    services:
+    - kind: Service
+      name: {{ include "tracetest-cloud.fullname" . }}
+      passHostHeader: true
+      port: control-plane
+      scheme: h2c