Improve the diff in cluster resources.

- Use the branch of pretty with this feature fixed:
  https://github.com/kr/pretty/pull/42
- Add the Limit to the resources declaration to avoid dummy
  differences between statefulsets (where both Resource structures
  are empty, but in one case the fields are not mentioned, while
  in another they are assigned to empty values).
This commit is contained in:
Oleksii Kliukin 2017-04-10 17:14:00 +02:00 committed by Murat Kabilov
parent 455f91128f
commit 3b99ce3d2e
4 changed files with 7 additions and 6 deletions

8
glide.lock generated
View File

@ -1,5 +1,5 @@
hash: df231b69e7a8a90bd0d1982289f36ecdcc30e1d65babd78b6dc1c908e49cec54 hash: 9cb22736d27cb74bb0f674c5e57954c8fd14e4b5cae0b2e22ead9f10728f91f8
updated: 2017-04-06T12:51:40.340251897+02:00 updated: 2017-04-10T15:33:31.332520218+02:00
imports: imports:
- name: cloud.google.com/go - name: cloud.google.com/go
version: 3b1ae45394a234c385be014e9a488f2bb6eef821 version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@ -77,8 +77,6 @@ imports:
version: 77ed1c8a01217656d2080ad51981f6e99adaa177 version: 77ed1c8a01217656d2080ad51981f6e99adaa177
- name: github.com/kelseyhightower/envconfig - name: github.com/kelseyhightower/envconfig
version: 8bf4bbfc795e2c7c8a5ea47b707453ed019e2ad4 version: 8bf4bbfc795e2c7c8a5ea47b707453ed019e2ad4
- name: github.com/kr/pretty
version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
- name: github.com/kr/text - name: github.com/kr/text
version: 7cafcd837844e784b526369c9bce262804aebc60 version: 7cafcd837844e784b526369c9bce262804aebc60
- name: github.com/lib/pq - name: github.com/lib/pq
@ -91,6 +89,8 @@ imports:
- buffer - buffer
- jlexer - jlexer
- jwriter - jwriter
- name: github.com/motomux/pretty
version: b2aad2c9a95d14eb978f29baa6e3a5c3c20eef30
- name: github.com/pborman/uuid - name: github.com/pborman/uuid
version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
- name: github.com/PuerkitoBio/purell - name: github.com/PuerkitoBio/purell

View File

@ -28,4 +28,4 @@ import:
- tools/cache - tools/cache
- tools/clientcmd - tools/clientcmd
- package: github.com/kelseyhightower/envconfig - package: github.com/kelseyhightower/envconfig
- package: github.com/kr/pretty - package: github.com/motomux/pretty

View File

@ -115,6 +115,7 @@ bootstrap:
ImagePullPolicy: v1.PullAlways, ImagePullPolicy: v1.PullAlways,
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: *resourceList, Requests: *resourceList,
Limits: v1.ResourceList{},
}, },
Ports: []v1.ContainerPort{ Ports: []v1.ContainerPort{
{ {

View File

@ -7,7 +7,7 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/kr/pretty" "github.com/motomux/pretty"
"github.bus.zalan.do/acid/postgres-operator/pkg/spec" "github.bus.zalan.do/acid/postgres-operator/pkg/spec"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"