X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0012-Add-imagePullSecrets.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0012-Add-imagePullSecrets.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=bc98d18fad981a8bce07a0c55077ed22840ad686;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0012-Add-imagePullSecrets.patch b/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0012-Add-imagePullSecrets.patch
deleted file mode 100644
index bc98d18..0000000
--- a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0012-Add-imagePullSecrets.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 440cae178989bf161276be0099691e9b7e5d211f Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Tue, 5 Nov 2019 07:42:36 -0500
-Subject: [PATCH 1/1] Add imagePullSecrets
-
----
- stable/elasticsearch-curator/templates/serviceaccount.yaml | 2 ++
- stable/filebeat/templates/serviceaccount.yaml              | 2 ++
- stable/kibana/templates/serviceaccount.yaml                | 2 ++
- stable/kube-state-metrics/values.yaml                      | 2 +-
- stable/metricbeat/templates/serviceaccount.yaml            | 2 ++
- 5 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/stable/elasticsearch-curator/templates/serviceaccount.yaml b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-index ad9c5c9..a64b426 100644
---- a/stable/elasticsearch-curator/templates/serviceaccount.yaml
-+++ b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-@@ -8,5 +8,7 @@ metadata:
-     chart: {{ template "elasticsearch-curator.chart" . }}
-     release: "{{ .Release.Name }}"
-     heritage: "{{ .Release.Service }}"
-+imagePullSecrets:
-+  - name: default-registry-key
- {{- end }}
- 
-diff --git a/stable/filebeat/templates/serviceaccount.yaml b/stable/filebeat/templates/serviceaccount.yaml
-index 7de907b..19a4d34 100644
---- a/stable/filebeat/templates/serviceaccount.yaml
-+++ b/stable/filebeat/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
-     chart: {{ template "filebeat.chart" . }}
-     release: {{ .Release.Name }}
-     heritage: {{ .Release.Service }}
-+imagePullSecrets:
-+  - name: default-registry-key
- {{- end -}}
-diff --git a/stable/kibana/templates/serviceaccount.yaml b/stable/kibana/templates/serviceaccount.yaml
-index 948390a..edc0122 100644
---- a/stable/kibana/templates/serviceaccount.yaml
-+++ b/stable/kibana/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
-     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-     heritage: {{ .Release.Service }}
-     release: {{ .Release.Name }}
-+imagePullSecrets:
-+  - name: default-registry-key
- {{- end -}}
-diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
-index 2bf5b30..bab7a30 100644
---- a/stable/kube-state-metrics/values.yaml
-+++ b/stable/kube-state-metrics/values.yaml
-@@ -31,7 +31,7 @@ serviceAccount:
-   name:
-   # Reference to one or more secrets to be used when pulling images
-   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
--  imagePullSecrets: []
-+  imagePullSecrets: [{"name": "default-registry-key"}]
- 
- prometheus:
-   monitor:
-diff --git a/stable/metricbeat/templates/serviceaccount.yaml b/stable/metricbeat/templates/serviceaccount.yaml
-index c53fc5a..a4c7659 100644
---- a/stable/metricbeat/templates/serviceaccount.yaml
-+++ b/stable/metricbeat/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
-     chart: {{ template "metricbeat.chart" . }}
-     release: {{ .Release.Name }}
-     heritage: {{ .Release.Service }}
-+imagePullSecrets:
-+  - name: default-registry-key
- {{- end -}}
--- 
-1.8.3.1
-