Nuke yaml from all objects

pkg/build/api/types.go

@@ -7,36 +7,36 @@ import (
 // Build encapsulates the inputs needed to produce a new deployable image, as well as
 // the status of the execution and a reference to the Pod which executed the build.
 type Build struct {
-	kapi.TypeMeta   `json:",inline" yaml:",inline"`
-	kapi.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	kapi.TypeMeta   `json:",inline"`
+	kapi.ObjectMeta `json:"metadata,omitempty"`
 
 	// Parameters are all the inputs used to create the build pod.
-	Parameters BuildParameters `json:"parameters,omitempty" yaml:"parameters,omitempty"`
+	Parameters BuildParameters `json:"parameters,omitempty"`
 
 	// Status is the current status of the build.
-	Status BuildStatus `json:"status,omitempty" yaml:"status,omitempty"`
+	Status BuildStatus `json:"status,omitempty"`
 
 	// PodName is the name of the pod that is used to execute the build
-	PodName string `json:"podName,omitempty" yaml:"podName,omitempty"`
+	PodName string `json:"podName,omitempty"`
 
 	// Cancelled describes if a cancelling event was triggered for the build.
-	Cancelled bool `json:"cancelled,omitempty" yaml:"cancelled,omitempty"`
+	Cancelled bool `json:"cancelled,omitempty"`
 }
 
 // BuildParameters encapsulates all the inputs necessary to represent a build.
 type BuildParameters struct {
 	// Source describes the SCM in use.
-	Source BuildSource `json:"source,omitempty" yaml:"source,omitempty"`
+	Source BuildSource `json:"source,omitempty"`
 
 	// Revision is the information from the source for a specific repo snapshot.
 	// This is optional.
-	Revision *SourceRevision `json:"revision,omitempty" yaml:"revision,omitempty"`
+	Revision *SourceRevision `json:"revision,omitempty"`
 
 	// Strategy defines how to perform a build.
-	Strategy BuildStrategy `json:"strategy,omitempty" yaml:"strategy,omitempty"`
+	Strategy BuildStrategy `json:"strategy,omitempty"`
 
 	// Output describes the Docker image the Strategy should produce.
-	Output BuildOutput `json:"output,omitempty" yaml:"output,omitempty"`
+	Output BuildOutput `json:"output,omitempty"`
 }
 
 // BuildStatus represents the status of a build at a point in time.
@@ -78,60 +78,60 @@ const (
 
 // BuildSource is the SCM used for the build
 type BuildSource struct {
-	Type BuildSourceType `json:"type,omitempty" yaml:"type,omitempty"`
-	Git  *GitBuildSource `json:"git,omitempty" yaml:"git,omitempty"`
+	Type BuildSourceType `json:"type,omitempty"`
+	Git  *GitBuildSource `json:"git,omitempty"`
 }
 
 // SourceRevision is the revision or commit information from the source for the build
 type SourceRevision struct {
-	Type BuildSourceType    `json:"type,omitempty" yaml:"type,omitempty"`
-	Git  *GitSourceRevision `json:"git,omitempty" yaml:"git,omitempty"`
+	Type BuildSourceType    `json:"type,omitempty"`
+	Git  *GitSourceRevision `json:"git,omitempty"`
 }
 
 // GitSourceRevision is the commit information from a git source for a build
 type GitSourceRevision struct {
 	// Commit is the commit hash identifying a specific commit
-	Commit string `json:"commit,omitempty" yaml:"commit,omitempty"`
+	Commit string `json:"commit,omitempty"`
 
 	// Author is the author of a specific commit
-	Author SourceControlUser `json:"author,omitempty" yaml:"author,omitempty"`
+	Author SourceControlUser `json:"author,omitempty"`
 
 	// Committer is the commiter of a specific commit
-	Committer SourceControlUser `json:"committer,omitempty" yaml:"committer,omitempty"`
+	Committer SourceControlUser `json:"committer,omitempty"`
 
 	// Message is the description of a specific commit
-	Message string `json:"message,omitempty" yaml:"message,omitempty"`
+	Message string `json:"message,omitempty"`
 }
 
 // GitBuildSource defines the parameters of a Git SCM
 type GitBuildSource struct {
 	// URI points to the source that will be built. The structure of the source
 	// will depend on the type of build to run
-	URI string `json:"uri,omitempty" yaml:"uri,omitempty"`
+	URI string `json:"uri,omitempty"`
 
 	// Ref is the branch/tag/ref to build.
-	Ref string `json:"ref,omitempty" yaml:"ref,omitempty"`
+	Ref string `json:"ref,omitempty"`
 }
 
 // SourceControlUser defines the identity of a user of source control
 type SourceControlUser struct {
-	Name  string `json:"name,omitempty" yaml:"name,omitempty"`
-	Email string `json:"email,omitempty" yaml:"email,omitempty"`
+	Name  string `json:"name,omitempty"`
+	Email string `json:"email,omitempty"`
 }
 
 // BuildStrategy contains the details of how to perform a build.
 type BuildStrategy struct {
 	// Type is the kind of build strategy.
-	Type BuildStrategyType `json:"type,omitempty" yaml:"type,omitempty"`
+	Type BuildStrategyType `json:"type,omitempty"`
 
 	// DockerStrategy holds the parameters to the Docker build strategy.
-	DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty" yaml:"dockerStrategy,omitempty"`
+	DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`
 
 	// STIStrategy holds the parameters to the STI build strategy.
-	STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty" yaml:"stiStrategy,omitempty"`
+	STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`
 
 	// CustomStrategy holds the parameters to the Custom build strategy.
-	CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty" yaml:"customStrategy,omitempty"`
+	CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`
 }
 
 // BuildStrategyType describes a particular way of performing a build.
@@ -163,54 +163,54 @@ const (
 type CustomBuildStrategy struct {
 	// Image is the image required to execute the build. If not specified
 	// a validation error is returned.
-	Image string `json:"image" yaml:"image"`
+	Image string `json:"image"`
 
 	// Additional environment variables you want to pass into a builder container
 	Env []kapi.EnvVar `json:"env,omitempty"`
 
 	// ExposeDockerSocket will allow running Docker commands (and build Docker images) from
 	// inside the Docker container.
 	// TODO: Allow admins to enforce 'false' for this option
-	ExposeDockerSocket bool `json:"exposeDockerSocket,omitempty" yaml:"exposeDockerSocket,omitempty"`
+	ExposeDockerSocket bool `json:"exposeDockerSocket,omitempty"`
 }
 
 // DockerBuildStrategy defines input parameters specific to Docker build.
 type DockerBuildStrategy struct {
 	// ContextDir is used as the Docker build context. It is a path for a directory within the
 	// application source directory structure (as referenced in the BuildSource. See GitBuildSource
 	// for an example.)
-	ContextDir string `json:"contextDir,omitempty" yaml:"contextDir,omitempty"`
+	ContextDir string `json:"contextDir,omitempty"`
 
 	// NoCache if set to true indicates that the docker build must be executed with the
 	// --no-cache=true flag
-	NoCache bool `json:"noCache,omitempty" yaml:"noCache,omitempty"`
+	NoCache bool `json:"noCache,omitempty"`
 
 	// BaseImage is optional and indicates the image that the dockerfile for this
 	// build should "FROM".  If present, the build process will substitute this value
 	// into the FROM line of the dockerfile.
-	BaseImage string `json:"baseImage,omitempty" yaml:"baseImage,omitempty"`
+	BaseImage string `json:"baseImage,omitempty"`
 }
 
 // STIBuildStrategy defines input parameters specific to an STI build.
 type STIBuildStrategy struct {
 	// Image is the image used to execute the build.
-	Image string `json:"image,omitempty" yaml:"image,omitempty"`
+	Image string `json:"image,omitempty"`
 
 	// Scripts is the location of STI scripts
-	Scripts string `json:"scripts,omitempty" yaml:"scripts,omitempty"`
+	Scripts string `json:"scripts,omitempty"`
 
 	// Clean flag forces the STI build to not do incremental builds if true.
-	Clean bool `json:"clean,omitempty" yaml:"clean,omitempty"`
+	Clean bool `json:"clean,omitempty"`
 }
 
 // BuildOutput is input to a build strategy and describes the Docker image that the strategy
 // should produce.
 type BuildOutput struct {
 	// ImageTag is the tag to give to the image resulting from the build.
-	ImageTag string `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
+	ImageTag string `json:"imageTag,omitempty"`
 
 	// Registry is the Docker registry which should receive the resulting built image via push.
-	Registry string `json:"registry,omitempty" yaml:"registry,omitempty"`
+	Registry string `json:"registry,omitempty"`
 }
 
 // BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig
@@ -219,50 +219,50 @@ const BuildConfigLabel = "buildconfig"
 
 // BuildConfig is a template which can be used to create new builds.
 type BuildConfig struct {
-	kapi.TypeMeta   `json:",inline" yaml:",inline"`
-	kapi.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	kapi.TypeMeta   `json:",inline"`
+	kapi.ObjectMeta `json:"metadata,omitempty"`
 
 	// Triggers determine how new Builds can be launched from a BuildConfig. If no triggers
 	// are defined, a new build can only occur as a result of an explicit client build creation.
-	Triggers []BuildTriggerPolicy `json:"triggers,omitempty" yaml:"triggers,omitempty"`
+	Triggers []BuildTriggerPolicy `json:"triggers,omitempty"`
 
 	// Parameters holds all the input necessary to produce a new build.
-	Parameters BuildParameters `json:"parameters,omitempty" yaml:"parameters,omitempty"`
+	Parameters BuildParameters `json:"parameters,omitempty"`
 }
 
 // WebHookTrigger is a trigger that gets invoked using a webhook type of post
 type WebHookTrigger struct {
 	// Secret used to validate requests.
-	Secret string `json:"secret,omitempty" yaml:"secret,omitempty"`
+	Secret string `json:"secret,omitempty"`
 }
 
 // ImageChangeTrigger allows builds to be triggered when an ImageRepository changes
 type ImageChangeTrigger struct {
 	// Image is used to specify the value in the BuildConfig to replace with the
 	// immutable image id supplied by the ImageRepository when this trigger fires.
-	Image string `json:"image" yaml:"image"`
+	Image string `json:"image"`
 	// ImageRepositoryRef a reference to a Docker image repository to watch for changes.
-	ImageRepositoryRef *kapi.ObjectReference `json:"imageRepositoryRef" yaml:"imageRepositoryRef"`
+	ImageRepositoryRef *kapi.ObjectReference `json:"imageRepositoryRef"`
 	// Tag is the name of an image repository tag to watch for changes.
-	Tag string `json:"tag,omitempty" yaml:"tag,omitempty"`
+	Tag string `json:"tag,omitempty"`
 	// LastTriggeredImageID is used internally by the ImageChangeController to save last
 	// used image ID for build
-	LastTriggeredImageID string `json:"lastTriggeredImageID,omitempty" yaml:"lastTriggeredImageID,omitempty"`
+	LastTriggeredImageID string `json:"lastTriggeredImageID,omitempty"`
 }
 
 // BuildTriggerPolicy describes a policy for a single trigger that results in a new Build.
 type BuildTriggerPolicy struct {
 	// Type is the type of build trigger
-	Type BuildTriggerType `json:"type,omitempty" yaml:"type,omitempty"`
+	Type BuildTriggerType `json:"type,omitempty"`
 
 	// GithubWebHook contains the parameters for a Github webhook type of trigger
-	GithubWebHook *WebHookTrigger `json:"github,omitempty" yaml:"github,omitempty"`
+	GithubWebHook *WebHookTrigger `json:"github,omitempty"`
 
 	// GenericWebHook contains the parameters for a Generic webhook type of trigger
-	GenericWebHook *WebHookTrigger `json:"generic,omitempty" yaml:"generic,omitempty"`
+	GenericWebHook *WebHookTrigger `json:"generic,omitempty"`
 
 	// ImageChange contains parameters for an ImageChange type of trigger
-	ImageChange *ImageChangeTrigger `json:"imageChange,omitempty" yaml:"imageChange,omitempty"`
+	ImageChange *ImageChangeTrigger `json:"imageChange,omitempty"`
 }
 
 // BuildTriggerType refers to a specific BuildTriggerPolicy implementation.
@@ -284,29 +284,29 @@ const (
 
 // BuildList is a collection of Builds.
 type BuildList struct {
-	kapi.TypeMeta `json:",inline" yaml:",inline"`
-	kapi.ListMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Items         []Build `json:"items" yaml:"items"`
+	kapi.TypeMeta `json:",inline"`
+	kapi.ListMeta `json:"metadata,omitempty"`
+	Items         []Build `json:"items"`
 }
 
 // BuildConfigList is a collection of BuildConfigs.
 type BuildConfigList struct {
-	kapi.TypeMeta `json:",inline" yaml:",inline"`
-	kapi.ListMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Items         []BuildConfig `json:"items" yaml:"items"`
+	kapi.TypeMeta `json:",inline"`
+	kapi.ListMeta `json:"metadata,omitempty"`
+	Items         []BuildConfig `json:"items"`
 }
 
 // GenericWebHookEvent is the payload expected for a generic webhook post
 type GenericWebHookEvent struct {
 	// Type is the type of source repository
-	Type BuildSourceType `json:"type,omitempty" yaml:"type,omitempty"`
+	Type BuildSourceType `json:"type,omitempty"`
 
 	// Git is the git information if the Type is BuildSourceGit
-	Git *GitInfo `json:"git,omitempty" yaml:"git,omitempty"`
+	Git *GitInfo `json:"git,omitempty"`
 }
 
 // GitInfo is the aggregated git information for a generic webhook post
 type GitInfo struct {
-	GitBuildSource    `json:",inline" yaml:",inline"`
-	GitSourceRevision `json:",inline" yaml:",inline"`
+	GitBuildSource    `json:",inline"`
+	GitSourceRevision `json:",inline"`
 }