From 9c4d593aab8a796195133615e8b488479763eb67 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 22 Feb 2018 22:52:24 -0800 Subject: [PATCH 1/2] PublicEndpoints to workload --- apis/project.cattle.io/v3/schema/schema.go | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index 84a2fe7d..dc1f1d53 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/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}, } } From 474dabf0dc50880c4b016fda41f58dafb742a989 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 22 Feb 2018 22:52:30 -0800 Subject: [PATCH 2/2] Generated changes --- client/project/v3/zz_generated_cron_job.go | 2 ++ client/project/v3/zz_generated_daemon_set.go | 2 ++ client/project/v3/zz_generated_deployment.go | 2 ++ client/project/v3/zz_generated_job.go | 2 ++ client/project/v3/zz_generated_replica_set.go | 2 ++ client/project/v3/zz_generated_replication_controller.go | 2 ++ client/project/v3/zz_generated_stateful_set.go | 2 ++ client/project/v3/zz_generated_workload.go | 2 ++ 8 files changed, 16 insertions(+) diff --git a/client/project/v3/zz_generated_cron_job.go b/client/project/v3/zz_generated_cron_job.go index d69926a0..046801cf 100644 --- a/client/project/v3/zz_generated_cron_job.go +++ b/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"` diff --git a/client/project/v3/zz_generated_daemon_set.go b/client/project/v3/zz_generated_daemon_set.go index ce1aea55..52886e26 100644 --- a/client/project/v3/zz_generated_daemon_set.go +++ b/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"` diff --git a/client/project/v3/zz_generated_deployment.go b/client/project/v3/zz_generated_deployment.go index 4a7474e9..c52ccbf2 100644 --- a/client/project/v3/zz_generated_deployment.go +++ b/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"` diff --git a/client/project/v3/zz_generated_job.go b/client/project/v3/zz_generated_job.go index aa2592c4..193e8da9 100644 --- a/client/project/v3/zz_generated_job.go +++ b/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"` diff --git a/client/project/v3/zz_generated_replica_set.go b/client/project/v3/zz_generated_replica_set.go index 188bec4d..f13cdef7 100644 --- a/client/project/v3/zz_generated_replica_set.go +++ b/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"` diff --git a/client/project/v3/zz_generated_replication_controller.go b/client/project/v3/zz_generated_replication_controller.go index 035221bf..8bc896a2 100644 --- a/client/project/v3/zz_generated_replication_controller.go +++ b/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"` diff --git a/client/project/v3/zz_generated_stateful_set.go b/client/project/v3/zz_generated_stateful_set.go index b8e396d7..a5cc6f48 100644 --- a/client/project/v3/zz_generated_stateful_set.go +++ b/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"` diff --git a/client/project/v3/zz_generated_workload.go b/client/project/v3/zz_generated_workload.go index 2a26c9fb..0d45ff1f 100644 --- a/client/project/v3/zz_generated_workload.go +++ b/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"`