This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/glide.yaml b/glide.yaml | |
index 34cc3c547c..c5fe7610f5 100644 | |
--- a/glide.yaml | |
+++ b/glide.yaml | |
@@ -38,15 +38,15 @@ import: | |
# openshift second | |
- package: github.com/openshift/api | |
- version: master | |
+ version: release-3.11 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/glide.yaml b/glide.yaml | |
index 34cc3c547c..df0b210e90 100644 | |
--- a/glide.yaml | |
+++ b/glide.yaml | |
@@ -210,3 +210,348 @@ import: | |
# yours: containers/image. No idea why this isn't self-pinning. | |
- package: github.com/containers/storage | |
version: 47536c89fcc545a87745e1a1573addc439409165 | |
+ | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
213,561d212 | |
< | |
< | |
< # generated by tools/depcheck | |
< - package: bitbucket.org/ww/goautoneg | |
< version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 | |
< - package: cloud.google.com/go | |
< version: 3b1ae45394a234c385be014e9a488f2bb6eef821 | |
< - package: github.com/AaronO/go-git-http | |
< version: 1d9485b3a98f7484772acb5f0dda28b69b958fdd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label.go | |
index 4aedac04ef..70efe87fc8 100644 | |
--- a/pkg/kubectl/cmd/label.go | |
+++ b/pkg/kubectl/cmd/label.go | |
@@ -254,11 +254,22 @@ func (o *LabelOptions) RunLabel() error { | |
var outputObj runtime.Object | |
dataChangeMsg := "not labeled" | |
if o.dryrun || o.local || o.list { | |
+ obj := info.Object | |
+ oldObj, err := json.Marshal(obj) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/kubectl/cmd/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo_dump.go | |
index c4200b221a..cee4efe0a7 100644 | |
--- a/pkg/kubectl/cmd/clusterinfo_dump.go | |
+++ b/pkg/kubectl/cmd/clusterinfo_dump.go | |
@@ -25,9 +25,11 @@ import ( | |
"github.com/spf13/cobra" | |
+ corev1 "k8s.io/api/core/v1" | |
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# ./oc3_11_master process -f test/templates/testdata/guestbook.json --local -l app=guestbook -o jsonpath="{ .items[*].apiVersion }" | |
route.openshift.io/v1 v1 v1 v1 v1 v1 v1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# ./oc3_11_master process -f test/templates/testdata/guestbook.json --local -l app=guestbook -o go-template="{{range .items}}{{.kind}} | |
{{end}}" | |
Route | |
Service | |
Service | |
Service | |
Pod | |
ReplicationController | |
ReplicationController |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
route.route.openshift.io/frontend-route | |
service/frontend-service | |
service/redis-master | |
service/redis-slave | |
pod/redis-master | |
replicationcontroller/guestbook | |
replicationcontroller/redis-slave |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"kind": "List", | |
"apiVersion": "v1", | |
"metadata": {}, | |
"items": [ | |
{ | |
"apiVersion": "route.openshift.io/v1", | |
"kind": "Route", | |
"metadata": { | |
"creationTimestamp": null, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Command | |
## ./oc3_11_master process -f test/templates/testdata/guestbook.json --local -l app=guestbook -o yaml | |
apiVersion: v1 | |
items: | |
- apiVersion: route.openshift.io/v1 | |
kind: Route | |
metadata: | |
creationTimestamp: null | |
labels: |
NewerOlder