Skip to content

Commit

Permalink
Merge pull request openebs#967 from kmova/master
Browse files Browse the repository at this point in the history
update the yamls to 0.5.0 containers
  • Loading branch information
Karthik Satchitanand authored Nov 29, 2017
2 parents 492ee3c + 2a3051d commit 104b03b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions k8s/charts/openebs/templates/deployment-openebs-grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
labels:
app: openbs-grafana
app: openebs-grafana
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
name: openbs-grafana
name: openebs-grafana
spec:
replicas: 1
revisionHistoryLimit: 2
template:
metadata:
labels:
app: openbs-grafana
app: openebs-grafana
spec:
containers:
- image: grafana/grafana:4.5.2
Expand Down
4 changes: 2 additions & 2 deletions k8s/charts/openebs/templates/service-openebs-grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Service
metadata:
name: openbs-grafana
name: openebs-grafana
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
spec:
Expand All @@ -12,5 +12,5 @@ spec:
targetPort: 3000
nodePort: 32515
selector:
app: openbs-grafana
app: openebs-grafana
{{- end }}
8 changes: 4 additions & 4 deletions k8s/charts/openebs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ image:

apiserver:
image: "openebs/m-apiserver"
tag: "0.5.0-RC2"
tag: "0.5.0"

provisioner:
image: "openebs/openebs-k8s-provisioner"
tag: "0.5.0-RC2"
tag: "0.5.0"
mayaportalurl: "https://mayaonline.io/"
monitorurl: "http://127.0.0.1:32515/dashboard/db/openebs-volume-stats?orgId=1"
monitorvolkey: "&var-OpenEBS"

jiva:
image: "openebs/jiva:0.5.0-RC2"
image: "openebs/jiva:0.5.0"
replicas: 2

policies:
monitoring:
enabled: true
image: "openebs/m-exporter:0.5.0-RC1"
image: "openebs/m-exporter:0.5.0"
10 changes: 5 additions & 5 deletions k8s/openebs-monitoring-pg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,29 +141,29 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: openbs-grafana
name: openebs-grafana
spec:
type: NodePort
ports:
- port: 3000
targetPort: 3000
nodePort: 32515
selector:
app: openbs-grafana
app: openebs-grafana
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
labels:
app: openbs-grafana
name: openbs-grafana
app: openebs-grafana
name: openebs-grafana
spec:
replicas: 1
revisionHistoryLimit: 2
template:
metadata:
labels:
app: openbs-grafana
app: openebs-grafana
spec:
containers:
- image: grafana/grafana:4.5.2
Expand Down
10 changes: 5 additions & 5 deletions k8s/openebs-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ spec:
containers:
- name: maya-apiserver
imagePullPolicy: Always
image: openebs/m-apiserver:0.5.0-RC2
image: openebs/m-apiserver:0.5.0
ports:
- containerPort: 5656
env:
- name: OPENEBS_IO_JIVA_CONTROLLER_IMAGE
value: "openebs/jiva:0.5.0-RC2"
value: "openebs/jiva:0.5.0"
- name: OPENEBS_IO_JIVA_REPLICA_IMAGE
value: "openebs/jiva:0.5.0-RC2"
value: "openebs/jiva:0.5.0"
- name: OPENEBS_IO_VOLUME_MONITOR_IMAGE
value: "openebs/m-exporter:0.5.0-RC1"
value: "openebs/m-exporter:0.5.0"
- name: OPENEBS_IO_JIVA_REPLICA_COUNT
value: "2"
---
Expand Down Expand Up @@ -113,7 +113,7 @@ spec:
containers:
- name: openebs-provisioner
imagePullPolicy: Always
image: openebs/openebs-k8s-provisioner:0.5.0-RC2
image: openebs/openebs-k8s-provisioner:0.5.0
env:
- name: NODE_NAME
valueFrom:
Expand Down

0 comments on commit 104b03b

Please sign in to comment.