diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-01 17:38:04 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-01 17:38:04 +0000 |
| commit | ccb080d94aa765d8391f262e25c5ead0764dc2ff (patch) | |
| tree | 643e50759d3d92617606850ac987507c0ed59774 /spec/fixtures | |
| parent | 52e133d17627396f29c1875b972534eaba4a837e (diff) | |
| parent | ebac9c81ad1e859afe73482dd6f112b141cf9ede (diff) | |
| download | gitlab-ce-ccb080d94aa765d8391f262e25c5ead0764dc2ff.tar.gz | |
Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'
Display ingress IP address in the Kubernetes page
See merge request gitlab-org/gitlab-ce!17052
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/cluster_status.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json index 489d563be2b..d27c12e43f2 100644 --- a/spec/fixtures/api/schemas/cluster_status.json +++ b/spec/fixtures/api/schemas/cluster_status.json @@ -30,7 +30,8 @@ ] } }, - "status_reason": { "type": ["string", "null"] } + "status_reason": { "type": ["string", "null"] }, + "external_ip": { "type": ["string", "null"] } }, "required" : [ "name", "status" ] } |