mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #39577 from kargakis/fix-openshift-example
Automatic merge from submit-queue (batch tested with PRs 39684, 39577, 38989, 39534, 39702) examples: fix OpenShift example Fixes https://github.com/kubernetes/kubernetes/issues/39575
This commit is contained in:
commit
efff7c0336
@ -265,11 +265,11 @@ func TestExampleObjectSchemas(t *testing.T) {
|
|||||||
},
|
},
|
||||||
"../examples/openshift-origin": {
|
"../examples/openshift-origin": {
|
||||||
"openshift-origin-namespace": &api.Namespace{},
|
"openshift-origin-namespace": &api.Namespace{},
|
||||||
"openshift-controller": &api.ReplicationController{},
|
"openshift-controller": &extensions.Deployment{},
|
||||||
"openshift-service": &api.Service{},
|
"openshift-service": &api.Service{},
|
||||||
"etcd-controller": &api.ReplicationController{},
|
"etcd-controller": &extensions.Deployment{},
|
||||||
"etcd-service": &api.Service{},
|
"etcd-service": &api.Service{},
|
||||||
"etcd-discovery-controller": &api.ReplicationController{},
|
"etcd-discovery-controller": &extensions.Deployment{},
|
||||||
"etcd-discovery-service": &api.Service{},
|
"etcd-discovery-service": &api.Service{},
|
||||||
"secret": nil,
|
"secret": nil,
|
||||||
},
|
},
|
||||||
|
@ -1,20 +1,16 @@
|
|||||||
kind: ReplicationController
|
apiVersion: extensions/v1beta1
|
||||||
apiVersion: v1
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: etcd
|
name: etcd
|
||||||
creationTimestamp:
|
|
||||||
spec:
|
spec:
|
||||||
strategy:
|
strategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
resources: {}
|
|
||||||
triggers:
|
|
||||||
- type: ConfigChange
|
|
||||||
replicas: 3
|
replicas: 3
|
||||||
selector:
|
selector:
|
||||||
|
matchLabels:
|
||||||
name: etcd
|
name: etcd
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
creationTimestamp:
|
|
||||||
labels:
|
labels:
|
||||||
name: etcd
|
name: etcd
|
||||||
spec:
|
spec:
|
||||||
@ -47,7 +43,6 @@ spec:
|
|||||||
resources: {}
|
resources: {}
|
||||||
terminationMessagePath: "/dev/termination-log"
|
terminationMessagePath: "/dev/termination-log"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
capabilities: {}
|
|
||||||
securityContext:
|
securityContext:
|
||||||
capabilities: {}
|
capabilities: {}
|
||||||
privileged: false
|
privileged: false
|
||||||
|
@ -1,20 +1,16 @@
|
|||||||
kind: ReplicationController
|
apiVersion: extensions/v1beta1
|
||||||
apiVersion: v1
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: etcd-discovery
|
name: etcd-discovery
|
||||||
creationTimestamp:
|
|
||||||
spec:
|
spec:
|
||||||
strategy:
|
strategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
resources: {}
|
|
||||||
triggers:
|
|
||||||
- type: ConfigChange
|
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
|
matchLabels:
|
||||||
name: etcd-discovery
|
name: etcd-discovery
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
creationTimestamp:
|
|
||||||
labels:
|
labels:
|
||||||
name: etcd-discovery
|
name: etcd-discovery
|
||||||
spec:
|
spec:
|
||||||
@ -29,7 +25,6 @@ spec:
|
|||||||
resources: {}
|
resources: {}
|
||||||
terminationMessagePath: "/dev/termination-log"
|
terminationMessagePath: "/dev/termination-log"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
capabilities: {}
|
|
||||||
securityContext:
|
securityContext:
|
||||||
capabilities: {}
|
capabilities: {}
|
||||||
privileged: false
|
privileged: false
|
||||||
|
@ -2,7 +2,6 @@ kind: Service
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
metadata:
|
metadata:
|
||||||
name: etcd-discovery
|
name: etcd-discovery
|
||||||
creationTimestamp:
|
|
||||||
labels:
|
labels:
|
||||||
name: etcd-discovery
|
name: etcd-discovery
|
||||||
spec:
|
spec:
|
||||||
|
@ -2,7 +2,6 @@ kind: Service
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
metadata:
|
metadata:
|
||||||
name: etcd
|
name: etcd
|
||||||
creationTimestamp:
|
|
||||||
labels:
|
labels:
|
||||||
name: etcd
|
name: etcd
|
||||||
spec:
|
spec:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
apiVersion: v1
|
apiVersion: extensions/v1beta1
|
||||||
kind: ReplicationController
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
name: openshift
|
name: openshift
|
||||||
@ -7,6 +7,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
|
matchLabels:
|
||||||
name: openshift
|
name: openshift
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -624,10 +624,10 @@ function start_kubedns {
|
|||||||
|
|
||||||
# TODO update to dns role once we have one.
|
# TODO update to dns role once we have one.
|
||||||
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create clusterrolebinding system:kube-dns --clusterrole=cluster-admin --serviceaccount=kube-system:default
|
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create clusterrolebinding system:kube-dns --clusterrole=cluster-admin --serviceaccount=kube-system:default
|
||||||
# use kubectl to create kubedns rc and service
|
# use kubectl to create kubedns deployment and service
|
||||||
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-deployment.yaml
|
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-deployment.yaml
|
||||||
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-svc.yaml
|
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-svc.yaml
|
||||||
echo "Kube-dns rc and service successfully deployed."
|
echo "Kube-dns deployment and service successfully deployed."
|
||||||
rm kubedns-deployment.yaml kubedns-svc.yaml
|
rm kubedns-deployment.yaml kubedns-svc.yaml
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user