1
0
mirror of https://github.com/rancher/types.git synced 2025-09-12 13:03:45 +00:00

Revert "Merge pull request #1190 from PennyScissors/relv24-fix-var-interpolation"

This reverts commit 0d90dc3a07, reversing
changes made to 98055cdcb6.
This commit is contained in:
Steven Crespo
2021-01-14 13:40:49 -08:00
parent adad487bf2
commit 84f3a507ba
5 changed files with 125 additions and 158 deletions

View File

@@ -48,7 +48,7 @@ type Container struct {
CapDrop []string `json:"capDrop,omitempty" yaml:"capDrop,omitempty"`
Command []string `json:"command,omitempty" yaml:"command,omitempty"`
Entrypoint []string `json:"entrypoint,omitempty" yaml:"entrypoint,omitempty"`
Environment []EnvironmentVar `json:"environment,omitempty" yaml:"environment,omitempty"`
Environment map[string]string `json:"environment,omitempty" yaml:"environment,omitempty"`
EnvironmentFrom []EnvironmentFrom `json:"environmentFrom,omitempty" yaml:"environmentFrom,omitempty"`
ExitCode *int64 `json:"exitCode,omitempty" yaml:"exitCode,omitempty"`
Image string `json:"image,omitempty" yaml:"image,omitempty"`

View File

@@ -1,14 +0,0 @@
package client
const (
EnvironmentVarType = "environmentVar"
EnvironmentVarFieldName = "name"
EnvironmentVarFieldValue = "value"
EnvironmentVarFieldValueFrom = "valueFrom"
)
type EnvironmentVar struct {
Name string `json:"name,omitempty" yaml:"name,omitempty"`
Value string `json:"value,omitempty" yaml:"value,omitempty"`
ValueFrom *EnvironmentFrom `json:"valueFrom,omitempty" yaml:"valueFrom,omitempty"`
}