Merge pull request #242 from alena1108/feb22

PublicEndpoints to workload

apis/project.cattle.io/v3/schema/schema.go

@@ -162,7 +162,9 @@ func statefulSetTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, v1beta2.StatefulSetSpec{}, statefulSetConfigOverride{}).
 		MustImportAndCustomize(&Version, v1beta2.StatefulSet{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func replicaSetTypes(schemas *types.Schemas) *types.Schemas {
@@ -189,7 +191,9 @@ func replicaSetTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, v1beta1.ReplicaSetSpec{}, replicaSetConfigOverride{}).
 		MustImportAndCustomize(&Version, v1beta1.ReplicaSet{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func replicationControllerTypes(schemas *types.Schemas) *types.Schemas {
@@ -216,7 +220,9 @@ func replicationControllerTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, v1.ReplicationControllerSpec{}, replicationControllerConfigOverride{}).
 		MustImportAndCustomize(&Version, v1.ReplicationController{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func daemonSetTypes(schemas *types.Schemas) *types.Schemas {
@@ -246,7 +252,9 @@ func daemonSetTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, v1beta2.DaemonSetSpec{}, daemonSetOverride{}).
 		MustImportAndCustomize(&Version, v1beta2.DaemonSet{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func jobTypes(schemas *types.Schemas) *types.Schemas {
@@ -284,7 +292,9 @@ func jobTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, batchv1.JobSpec{}, jobOverride{}).
 		MustImportAndCustomize(&Version, batchv1.Job{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func cronJobTypes(schemas *types.Schemas) *types.Schemas {
@@ -351,7 +361,9 @@ func cronJobTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, batchv1beta1.JobTemplateSpec{}).
 		MustImportAndCustomize(&Version, batchv1beta1.CronJob{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func deploymentTypes(schemas *types.Schemas) *types.Schemas {
@@ -393,7 +405,9 @@ func deploymentTypes(schemas *types.Schemas) *types.Schemas {
 		MustImport(&Version, v1beta2.DeploymentSpec{}, deploymentConfigOverride{}).
 		MustImportAndCustomize(&Version, v1beta2.Deployment{}, func(schema *types.Schema) {
 			schema.BaseType = "workload"
-		}, projectOverride{})
+		}, projectOverride{}, struct {
+			PublicEndpoints string `json:"publicEndpoints" norman:"type=array[publicEndpoint],nocreate,noupdate"`
+		}{})
 }
 
 func podTypes(schemas *types.Schemas) *types.Schemas {
@@ -657,5 +671,6 @@ func NewWorkloadTypeMapper() types.Mapper {
 		&m.Move{From: "metadata/annotations", To: "annotations", NoDeleteFromField: true},
 		&m.Drop{Field: "metadata"},
 		mapper.ContainerPorts{},
+		&m.AnnotationField{Field: "publicEndpoints", List: true},
 	}
 }

client/project/v3/zz_generated_cron_job.go

@@ -31,6 +31,7 @@ const (
 	CronJobFieldPriority                      = "priority"
 	CronJobFieldPriorityClassName             = "priorityClassName"
 	CronJobFieldProjectID                     = "projectId"
+	CronJobFieldPublicEndpoints               = "publicEndpoints"
 	CronJobFieldRemoved                       = "removed"
 	CronJobFieldRestartPolicy                 = "restartPolicy"
 	CronJobFieldRunAsNonRoot                  = "runAsNonRoot"
@@ -77,6 +78,7 @@ type CronJob struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	RestartPolicy                 string                 `json:"restartPolicy,omitempty"`
 	RunAsNonRoot                  *bool                  `json:"runAsNonRoot,omitempty"`

client/project/v3/zz_generated_daemon_set.go

@@ -31,6 +31,7 @@ const (
 	DaemonSetFieldPriority                      = "priority"
 	DaemonSetFieldPriorityClassName             = "priorityClassName"
 	DaemonSetFieldProjectID                     = "projectId"
+	DaemonSetFieldPublicEndpoints               = "publicEndpoints"
 	DaemonSetFieldRemoved                       = "removed"
 	DaemonSetFieldRestartPolicy                 = "restartPolicy"
 	DaemonSetFieldRunAsNonRoot                  = "runAsNonRoot"
@@ -77,6 +78,7 @@ type DaemonSet struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	RestartPolicy                 string                 `json:"restartPolicy,omitempty"`
 	RunAsNonRoot                  *bool                  `json:"runAsNonRoot,omitempty"`

client/project/v3/zz_generated_deployment.go

@@ -31,6 +31,7 @@ const (
 	DeploymentFieldPriority                      = "priority"
 	DeploymentFieldPriorityClassName             = "priorityClassName"
 	DeploymentFieldProjectID                     = "projectId"
+	DeploymentFieldPublicEndpoints               = "publicEndpoints"
 	DeploymentFieldRemoved                       = "removed"
 	DeploymentFieldRestartPolicy                 = "restartPolicy"
 	DeploymentFieldRunAsNonRoot                  = "runAsNonRoot"
@@ -78,6 +79,7 @@ type Deployment struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	RestartPolicy                 string                 `json:"restartPolicy,omitempty"`
 	RunAsNonRoot                  *bool                  `json:"runAsNonRoot,omitempty"`

client/project/v3/zz_generated_job.go

@@ -31,6 +31,7 @@ const (
 	JobFieldPriority                      = "priority"
 	JobFieldPriorityClassName             = "priorityClassName"
 	JobFieldProjectID                     = "projectId"
+	JobFieldPublicEndpoints               = "publicEndpoints"
 	JobFieldRemoved                       = "removed"
 	JobFieldRestartPolicy                 = "restartPolicy"
 	JobFieldRunAsNonRoot                  = "runAsNonRoot"
@@ -77,6 +78,7 @@ type Job struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	RestartPolicy                 string                 `json:"restartPolicy,omitempty"`
 	RunAsNonRoot                  *bool                  `json:"runAsNonRoot,omitempty"`

client/project/v3/zz_generated_replica_set.go

@@ -29,6 +29,7 @@ const (
 	ReplicaSetFieldPriority                      = "priority"
 	ReplicaSetFieldPriorityClassName             = "priorityClassName"
 	ReplicaSetFieldProjectID                     = "projectId"
+	ReplicaSetFieldPublicEndpoints               = "publicEndpoints"
 	ReplicaSetFieldRemoved                       = "removed"
 	ReplicaSetFieldReplicaSet                    = "replicaSet"
 	ReplicaSetFieldReplicaSetStatus              = "replicaSetStatus"
@@ -75,6 +76,7 @@ type ReplicaSet struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	ReplicaSet                    *ReplicaSetConfig      `json:"replicaSet,omitempty"`
 	ReplicaSetStatus              *ReplicaSetStatus      `json:"replicaSetStatus,omitempty"`

client/project/v3/zz_generated_replication_controller.go

@@ -29,6 +29,7 @@ const (
 	ReplicationControllerFieldPriority                      = "priority"
 	ReplicationControllerFieldPriorityClassName             = "priorityClassName"
 	ReplicationControllerFieldProjectID                     = "projectId"
+	ReplicationControllerFieldPublicEndpoints               = "publicEndpoints"
 	ReplicationControllerFieldRemoved                       = "removed"
 	ReplicationControllerFieldReplicationController         = "replicationController"
 	ReplicationControllerFieldReplicationControllerStatus   = "replicationControllerStatus"
@@ -75,6 +76,7 @@ type ReplicationController struct {
 	Priority                      *int64                       `json:"priority,omitempty"`
 	PriorityClassName             string                       `json:"priorityClassName,omitempty"`
 	ProjectID                     string                       `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint             `json:"publicEndpoints,omitempty"`
 	Removed                       string                       `json:"removed,omitempty"`
 	ReplicationController         *ReplicationControllerConfig `json:"replicationController,omitempty"`
 	ReplicationControllerStatus   *ReplicationControllerStatus `json:"replicationControllerStatus,omitempty"`

client/project/v3/zz_generated_stateful_set.go

@@ -29,6 +29,7 @@ const (
 	StatefulSetFieldPriority                      = "priority"
 	StatefulSetFieldPriorityClassName             = "priorityClassName"
 	StatefulSetFieldProjectID                     = "projectId"
+	StatefulSetFieldPublicEndpoints               = "publicEndpoints"
 	StatefulSetFieldRemoved                       = "removed"
 	StatefulSetFieldRestartPolicy                 = "restartPolicy"
 	StatefulSetFieldRunAsNonRoot                  = "runAsNonRoot"
@@ -75,6 +76,7 @@ type StatefulSet struct {
 	Priority                      *int64                 `json:"priority,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
 	ProjectID                     string                 `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint       `json:"publicEndpoints,omitempty"`
 	Removed                       string                 `json:"removed,omitempty"`
 	RestartPolicy                 string                 `json:"restartPolicy,omitempty"`
 	RunAsNonRoot                  *bool                  `json:"runAsNonRoot,omitempty"`

client/project/v3/zz_generated_workload.go

@@ -37,6 +37,7 @@ const (
 	WorkloadFieldPriority                      = "priority"
 	WorkloadFieldPriorityClassName             = "priorityClassName"
 	WorkloadFieldProjectID                     = "projectId"
+	WorkloadFieldPublicEndpoints               = "publicEndpoints"
 	WorkloadFieldRemoved                       = "removed"
 	WorkloadFieldReplicaSet                    = "replicaSet"
 	WorkloadFieldReplicaSetStatus              = "replicaSetStatus"
@@ -96,6 +97,7 @@ type Workload struct {
 	Priority                      *int64                       `json:"priority,omitempty"`
 	PriorityClassName             string                       `json:"priorityClassName,omitempty"`
 	ProjectID                     string                       `json:"projectId,omitempty"`
+	PublicEndpoints               []PublicEndpoint             `json:"publicEndpoints,omitempty"`
 	Removed                       string                       `json:"removed,omitempty"`
 	ReplicaSet                    *ReplicaSetConfig            `json:"replicaSet,omitempty"`
 	ReplicaSetStatus              *ReplicaSetStatus            `json:"replicaSetStatus,omitempty"`