FED 1475: Fix splunk-connect-for-kubernetes (#149)

charts/credrotation-operator/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/splunk-connect-for-kubernetes/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/splunk/fluent-plugin-kubernetes-metrics
 - https://github.com/splunk/fluent-plugin-k8s-metrics-agg
 - https://github.com/splunk/fluent-plugin-kubernetes-objects
-version: 1.5.4
+version: 1.5.4-bs1

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/_helpers.tpl

@@ -169,7 +169,7 @@ Create the image name
 {{- if contains .Values.image.tag "sha256" -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
+{{- printf "%s:%s" .Values.image.name .Values.image.tag -}}
 {{- end -}}
 {{- end -}}
 

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml

@@ -56,7 +56,7 @@ spec:
       {{- end }}
       {{- if .Values.image.usePullSecret }}
       imagePullSecrets:
-      - name: {{ .Values.image.pullSecretName }}
+      - name: {{ .Values.image.pullSecretName  }}
       {{- end }}
       containers:
       - name: splunk-fluentd-k8s-logs

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/_helpers.tpl

@@ -71,7 +71,7 @@ Create the image name
 {{- if contains .Values.image.tag "sha256" -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
+{{- printf "%s:%s" .Values.image.name .Values.image.tag -}}
 {{- end -}}
 {{- end -}}
 {{/*
@@ -81,7 +81,7 @@ Create the aggregate image name
 {{- if contains .Values.imageAgg.tag "sha256" -}}
 {{- printf "%s/%s@%s" .Values.imageAgg.registry .Values.imageAgg.name .Values.imageAgg.tag -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.imageAgg.registry .Values.imageAgg.name .Values.imageAgg.tag -}}
+{{- printf "%s:%s" .Values.imageAgg.name .Values.imageAgg.tag -}}
 {{- end -}}
 {{- end -}}
 

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml

@@ -60,7 +60,7 @@ spec:
       {{- end }}
       {{- if .Values.image.usePullSecret }}
       imagePullSecrets:
-      - name: {{ .Values.image.pullsecretName}}
+      - name: {{ .Values.image.pullSecretName}}
       {{- end }}
       containers:
       - name: splunk-fluentd-k8s-metrics

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml

@@ -53,7 +53,7 @@ spec:
       {{- end }}
       {{- if .Values.imageAgg.usePullSecret }}
       imagePullSecrets:
-      - name: {{ .Values.imageAgg.pullsecretName}}
+      - name: {{ .Values.imageAgg.pullSecretName}}
       {{- end }}
       containers:
       - name: splunk-fluentd-k8s-metrics-agg

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml

@@ -101,7 +101,7 @@ image:
   # Indicates if the image should be pulled using authentication from a secret
   usePullSecret: false
   # The name of the pull secret to attach to the respective serviceaccount used to pull the image
-  pullsecretName:
+  pullSecretName:
 
 # Defines which version of image to use, and how it should be pulled.
 imageAgg:
@@ -116,7 +116,7 @@ imageAgg:
   # Indicates if the image should be pulled using authentication from a secret
   usePullSecret: false
   # The name of the pull secret to attach to the respective serviceaccount used to pull the image
-  pullsecretName:
+  pullSecretName:
 
 # Environment variable for metrics daemonset
 environmentVar:

charts/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/_helpers.tpl

@@ -100,7 +100,7 @@ Create the image name
 {{- if contains .Values.image.tag "sha256" -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
+{{- printf "%s:%s" .Values.image.name .Values.image.tag -}}
 {{- end -}}
 {{- end -}}
 

charts/splunk-connect-for-kubernetes/requirements.yaml

@@ -1,13 +1,13 @@
 dependencies:
   - name: splunk-kubernetes-logging
     version: 1.5.4
-    repository: https://splunk.github.io/splunk-connect-for-kubernetes/
+    repository: file://charts/splunk-kubernetes-logging/
     condition: splunk-kubernetes-logging.enabled
   - name: splunk-kubernetes-objects
     version: 1.5.4
-    repository: https://splunk.github.io/splunk-connect-for-kubernetes/
+    repository: file://charts/splunk-kubernetes-objects/
     condition: splunk-kubernetes-objects.enabled
   - name: splunk-kubernetes-metrics
     version: 1.5.4
-    repository: https://splunk.github.io/splunk-connect-for-kubernetes/
+    repository: file://charts/splunk-kubernetes-metrics/
     condition: splunk-kubernetes-metrics.enabled

charts/splunk-connect-for-kubernetes/values.yaml

@@ -1003,22 +1003,22 @@ splunk-kubernetes-metrics:
     # Indicates if the image should be pulled using authentication from a secret
     usePullSecret: false
     # The name of the pull secret to attach to the respective serviceaccount used to pull the image
-    pullsecretName:
+    pullSecretName:
 
   # Defines which version of image to use, and how it should be pulled.
   imageAgg:
     # The domain of the registry to pull the image from
     registry: docker.io
     # The name of the image to pull
-    name: splunk/k8s-metrics-aggr
+    name: bluescape/splunk-k8s-metrics-aggr
     # The tag of the image to pull
     tag: 1.2.3
     # The policy that specifies when the user wants the images to be pulled
     pullPolicy: IfNotPresent
     # Indicates if the image should be pulled using authentication from a secret
     usePullSecret: false
     # The name of the pull secret to attach to the respective serviceaccount used to pull the image
-    pullsecretName:
+    pullSecretName:
 
   # Environment variable for metrics daemonset
   environmentVar: