Commit 2461b857 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

- Upgraded the redis gopackage to remove the rejonson library 

- Updated redis helm chart to use bitnami/redis image
parent b00ccc71

charts/redis/templates/redis-master-statefulset.yaml

+4 −4
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ spec: 
          {{- if .Values.containerSecurityContext.enabled }}

          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}

          {{- end }}

          # command:

          #   - /bin/bash

          #   - -c

          #   - /opt/bitnami/scripts/start-scripts/start-master.sh

          command:

            - /bin/bash

            - -c

            - /opt/bitnami/scripts/start-scripts/start-master.sh

          env:

            - name: REDIS_REPLICATION_MODE

              value: master

charts/redis/templates/redis-slave-statefulset.yaml

+4 −4
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ spec: 
          {{- if .Values.containerSecurityContext.enabled }}

          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}

          {{- end }}

          # command:

          #   - /bin/bash

          #   - -c

          #   - /opt/bitnami/scripts/start-scripts/start-slave.sh

          command:

            - /bin/bash

            - -c

            - /opt/bitnami/scripts/start-scripts/start-slave.sh

          env:

            - name: REDIS_REPLICATION_MODE

              value: slave

charts/redis/values.yaml

+2 −4
Original line number Diff line number Diff line
@@ -14,13 +14,11 @@ global: 
##

image:

  registry: docker.io

  # repository: bitnami/redis

  repository: redislabs/rejson

  repository: bitnami/redis

  ## Bitnami Redis(TM) image tag

  ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links

  ##

  # tag: 6.0.9-debian-10-r66

  tag: 1.0.7

  tag: 6.0.9-debian-10-r66

  ## Specify a imagePullPolicy

  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

go-apps/meep-tc-engine/go.mod

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-net-char-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-pdu-session-store v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/gogo/protobuf v1.2.1 // indirect

	github.com/google/btree v1.0.0 // indirect

go-apps/meep-virt-engine/go.sum

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=

golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=

golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=