improve idslice

This commit is contained in:
Jingfang Liu
2018-09-05 13:02:51 -07:00
parent 7811d9f2bc
commit 4a297fa138
2 changed files with 9 additions and 9 deletions

View File

@@ -78,16 +78,10 @@ metadata:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations:
prometheus.io/path: _status/vars
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
labels: labels:
app: cockroachdb app: cockroachdb
name: dev-base-cockroachdb name: dev-base-cockroachdb-public
spec: spec:
clusterIP: None
ports: ports:
- name: grpc - name: grpc
port: 26257 port: 26257
@@ -101,10 +95,16 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations:
prometheus.io/path: _status/vars
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
labels: labels:
app: cockroachdb app: cockroachdb
name: dev-base-cockroachdb-public name: dev-base-cockroachdb
spec: spec:
clusterIP: None
ports: ports:
- name: grpc - name: grpc
port: 26257 port: 26257

View File

@@ -34,7 +34,7 @@ func (a IdSlice) Less(i, j int) bool {
if a[i].Gvk().String() != a[j].Gvk().String() { if a[i].Gvk().String() != a[j].Gvk().String() {
return gvkLess(a[i].Gvk(), a[j].Gvk()) return gvkLess(a[i].Gvk(), a[j].Gvk())
} }
return a[i].Name() < a[j].Name() return a[i].String() < a[j].String()
} }
var order = []string{"Namespace", "CustomResourceDefinition", "ServiceAccount", var order = []string{"Namespace", "CustomResourceDefinition", "ServiceAccount",