Use default k8s secure port based on docs

OSH ingres controller clash with 443 port.
Suggest to change k8s to align with defaults from docs
Fix kube-dns policy error

Change-Id: Iaca1957292a0a9b4de2be044ea12bec0c77c5301
This commit is contained in:
Kaspars Skels 2017-09-30 11:58:55 -05:00
parent 299c02ebb2
commit 4712f60eb4
9 changed files with 8 additions and 41 deletions

View File

@ -1,36 +1,3 @@
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
labels:
kubernetes.io/bootstrapping: rbac-defaults
name: system:kube-dns
rules:
- apiGroups:
- ""
resources:
- endpoints
- services
verbs:
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
labels:
kubernetes.io/bootstrapping: rbac-defaults
name: system:kube-dns
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:kube-dns
subjects:
- kind: ServiceAccount
name: kube-dns
namespace: kube-system
---
apiVersion: v1
kind: ServiceAccount

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/kubelet/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/proxy/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/asset-loader/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://127.0.0.1
server: https://127.0.0.1:6443
certificate-authority: /target/etc/kubernetes/admin/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/admin/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/controller-manager/pki/cluster-ca.pem
name: kubernetes
contexts:

View File

@ -26,7 +26,7 @@ spec:
- --insecure-bind-address=127.0.0.1
- --bind-address=0.0.0.0
- --runtime-config=batch/v2alpha1=true
- --secure-port=443
- --secure-port=6443
- --allow-privileged=true
- --etcd-servers=https://kubernetes:2379
- --etcd-cafile=/etc/kubernetes/pki/etcd-client-ca.pem

View File

@ -2,7 +2,7 @@
apiVersion: v1
clusters:
- cluster:
server: https://kubernetes
server: https://kubernetes:6443
certificate-authority: /etc/kubernetes/scheduler/pki/cluster-ca.pem
name: kubernetes
contexts: