This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
commit 7cac688d7d70a82b40ff452bdeb3d699cd56a957 Author: innerpeacez <37059529+innerpea...@users.noreply.github.com> AuthorDate: Mon May 27 13:47:52 2019 +0800 Modify the image pull policy and modify the filename extension to .yaml (#12) --- .../{elasticsearch-service.yml => elasticsearch-service.yaml} | 0 .../{elasticsearch-statefulset.yml => elasticsearch-statefulset.yaml} | 1 + .../skywalking/templates/oap/{oap-config.yml => oap-config.yaml} | 0 .../skywalking/templates/oap/{oap-deployment.yml => oap-deployment.yaml} | 1 + .../skywalking/templates/oap/{oap-service.yml => oap-service.yaml} | 0 .../templates/oap/{oap-serviceaccount.yml => oap-serviceaccount.yaml} | 0 .../skywalking/templates/ui/{ui-deployment.yml => ui-deployment.yaml} | 1 + .../6.0.0-GA/skywalking/templates/ui/{ui-service.yml => ui-service.yaml} | 0 8 files changed, 3 insertions(+) diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml similarity index 100% rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml similarity index 98% rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml index e2919d4..ea776ed 100644 --- a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml +++ b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml @@ -75,6 +75,7 @@ spec: containers: - name: elasticsearch image: {{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }} + imagePullPolicy: {{ .Values.elasticsearch.image.pullPolicy }} ports: - containerPort: {{ .Values.elasticsearch.ports.http }} name: http diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml similarity index 100% rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml similarity index 97% rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml index 2bfd271..611379f 100644 --- a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml +++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml @@ -34,6 +34,7 @@ spec: containers: - name: {{ .Values.oap.name }} image: {{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }} + imagePullPolicy: {{ .Values.oap.image.pullPolicy }} ports: - containerPort: {{ .Values.oap.ports.grpc }} name: grpc diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml similarity index 100% rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml similarity index 100% rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml similarity index 96% rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml index b11f9fc..2c0b637 100644 --- a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml +++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml @@ -33,6 +33,7 @@ spec: containers: - name: {{ .Values.ui.name }} image: {{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }} + imagePullPolicy: {{ .Values.ui.image.pullPolicy }} ports: - containerPort: {{ .Values.ui.ports.page }} name: page diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml similarity index 100% rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml rename to helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml