1.10 update (#7151)
* Fix partition value expected behaviour explanation (#7123) Fixes issue #7057 * Correct "On-Premise" to "On-Premises" * Updates the Calico installation page (#7094) * All files for Haufe Groups case study (#7051) * Fix typo (#7127) * fix typo of device-plugins.md (#7106) * fix broken links (#7136) * Updated configure-service-account (#7147) Error from server resolved by escaping kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "myregistrykey"}]}' JSON string by '\'
This commit is contained in:
committed by
zacharysarah
parent
f75db126a8
commit
7136ac7265
@@ -62,8 +62,17 @@ metadata:
|
||||
name: demo-pod
|
||||
spec:
|
||||
containers:
|
||||
<<<<<<< HEAD
|
||||
- name: demo-container-1
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
||||||| merged common ancestors
|
||||
-
|
||||
name: demo-container-1
|
||||
image: gcr.io/google_containers/pause:2.0
|
||||
=======
|
||||
- name: demo-container-1
|
||||
image: gcr.io/google_containers/pause:2.0
|
||||
>>>>>>> 1.10 update (#7151)
|
||||
resources:
|
||||
limits:
|
||||
vendor-domain/resource: 2 # requesting 2 vendor-domain/resource
|
||||
|
||||
Reference in New Issue
Block a user