Skip to content

Commit

Permalink
Merge pull request #9 from Commvault/initcontainer
Browse files Browse the repository at this point in the history 
oem change
  • Loading branch information
@cvltmaheshp
cvltmaheshp authored May 22, 2024
2 parents 3052efd + 44f178b commit b2a86ed
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 49 deletions.
2 changes: 1 addition & 1 deletion charts/accessnode/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: accessnode
description: A Helm chart for creating an access node
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/accessnode/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/commandcenter/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: commandcenter
description: A Helm chart for creating the command center
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/commandcenter/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/config/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: config
description: A Helm chart for creating the base configuration and secret for all cv components in the namespace
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/config/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/cs/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: commserve
description: A Helm chart for creating the CS component
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/cs/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/mediaagent/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: mediaagent
description: A Helm chart for creating a media agent
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/mediaagent/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/networkgateway/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: networkgateway
description: A Helm chart for creating an FS agent which can serve as a network gateway
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/networkgateway/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/webserver/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: webserver
description: A Helm chart for creating the webserver
type: application
version: "1.0.1"
version: "1.0.2"
appVersion: "1"
14 changes: 8 additions & 6 deletions charts/webserver/templates/_utils.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,21 @@ Returns "true" if the image tag's version and FR is at least what is given as in
{{/*
Finds the appropriate oem id to use.
Either explicit oem id is passed in as parameter or it will be assumed based on feature release
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "" }}
This was an if condition added earlier to determine oemid based on feature release
but no longer relevant
{{- if eq (len $release) 4 }}
{{- $oemid = "119" }}
{{- else }}
{{- $oemid = "1" }}
{{- end }}
*/}}
{{- define "cv.utils.getOemId" }}
{{- $release := include "cv.utils.getFeatureRelease" . }}
{{- $oemid := "1" }}
{{- $oemid = or .Values.oemid ((.Values).global).oemid $oemid }}
{{- quote $oemid }}
{{- end }}
{{/*
Returns either commvault or metallic depending on the oem id
*/}}
Expand Down

0 comments on commit b2a86ed

Please sign in to comment.