remove global

Author: NimrodAvni78

charts/opentelemetry-ebpf-instrumentation/templates/cache-deployment.yaml

@@ -29,17 +29,13 @@ spec:
       {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ include "obi.serviceAccountName" . }}
       {{- end }}
-      {{- if or .Values.global.image.pullSecrets .Values.image.pullSecrets }}
+      {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
-        {{- if .Values.global.image.pullSecrets }}
-        {{- toYaml .Values.global.image.pullSecrets | nindent 8 }}
-        {{- else }}
         {{- toYaml .Values.image.pullSecrets | nindent 8 }}
-        {{- end }}
       {{- end }}
       containers:
         - name: obi-k8s-cache
-          image: {{ .Values.global.image.registry | default .Values.k8sCache.image.registry }}/{{ .Values.k8sCache.image.repository }}{{ include "obi.k8sCache.imageId" . }}
+          image: {{ .Values.k8sCache.image.registry }}/{{ .Values.k8sCache.image.repository }}{{ include "obi.k8sCache.imageId" . }}
           imagePullPolicy: {{ .Values.k8sCache.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.k8sCache.service.port }}

charts/opentelemetry-ebpf-instrumentation/templates/daemonset.yaml

@@ -48,7 +48,7 @@ spec:
         {{- end }}
       containers:
         - name: ebpf-instrument
-          image: {{ .Values.global.image.registry | default .Values.image.registry }}/{{ .Values.image.repository }}{{ include "obi.imageId" . }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}{{ include "obi.imageId" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           securityContext:
           {{- if .Values.privileged }}
@@ -119,13 +119,9 @@ spec:
           {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
-      {{- if or .Values.global.image.pullSecrets .Values.image.pullSecrets }}
+      {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
-        {{- if .Values.global.image.pullSecrets }}
-        {{- toYaml .Values.global.image.pullSecrets | nindent 8 }}
-        {{- else }}
         {{- toYaml .Values.image.pullSecrets | nindent 8 }}
-        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

charts/opentelemetry-ebpf-instrumentation/values.yaml

@@ -1,12 +1,3 @@
-## Global properties for image pulling override the values defined under `image.registry`.
-## If you want to override only one image registry, use the specific fields but if you want to override them all, use `global.image.registry`
-global:
-  image:
-    # -- Global image registry to use if it needs to be overridden for some specific use cases (e.g local registries, custom images, ...)
-    registry: ""
-    # -- Optional set of global image pull secrets.
-    pullSecrets: []
-
 image:
   # -- Opentelemetry eBPF Instrumentation image registry (defaults to docker.io)
   registry: "docker.io"