diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-06 17:06:55 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-06 17:06:55 +0000 |
| commit | fb70fadaca6d2ce30730e9a6c995ad8e4f0526e3 (patch) | |
| tree | 846e43a446ab90c4320cee4d1c1379851ebb10ea /app/serializers | |
| parent | a68a39e34120e0cf67d95e143326d03f61288cdf (diff) | |
| parent | 86cea3a544951b1d2fd9795c6ffb83e98cbd97cd (diff) | |
| download | gitlab-ce-fb70fadaca6d2ce30730e9a6c995ad8e4f0526e3.tar.gz | |
Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master'
Create Kubernetes cluster on GKE from k8s service
Closes #35954
See merge request gitlab-org/gitlab-ce!14470
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/cluster_entity.rb | 6 | ||||
| -rw-r--r-- | app/serializers/cluster_serializer.rb | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb new file mode 100644 index 00000000000..08a113c4d8a --- /dev/null +++ b/app/serializers/cluster_entity.rb @@ -0,0 +1,6 @@ +class ClusterEntity < Grape::Entity + include RequestAwareEntity + + expose :status_name, as: :status + expose :status_reason +end diff --git a/app/serializers/cluster_serializer.rb b/app/serializers/cluster_serializer.rb new file mode 100644 index 00000000000..2c87202a105 --- /dev/null +++ b/app/serializers/cluster_serializer.rb @@ -0,0 +1,7 @@ +class ClusterSerializer < BaseSerializer + entity ClusterEntity + + def represent_status(resource) + represent(resource, { only: [:status, :status_reason] }) + end +end |