kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6317 from gambol99/fix_kubelet_api_manifest 

Kubelet API RBAC Manifest
This commit is contained in:
Kubernetes Prow Robot 2019-01-09 08:18:58 -08:00 committed by GitHub
parent 183d71a270 2429997121
commit fe074fbd30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
upup/models/cloudup/resources/addons/rbac.addons.k8s.io/kubelet-api-admin.yaml → upup/models/cloudup/resources/addons/kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
View File

6
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -269,12 +269,12 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
// Adding the kubelet-api-admin binding: this is required when switching to webhook authorization on the kubelet
// docs: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#other-component-roles
// issue: https://github.com/kubernetes/kops/issues/5176
key := "rbac.addons.k8s.io"
key := "kubelet-api.rbac.addons.k8s.io"
version := "v0.0.1"
{
id := "kubelet-api-admin"
location := key + "/kubelet-api-admin.yaml"
location := key + "/k8s-1.9.yaml"
id := "k8s-1.9"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key),

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -30,12 +30,12 @@ spec:
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
- id: kubelet-api-admin
- id: k8s-1.9
kubernetesVersion: '>=1.9.0'
manifest: rbac.addons.k8s.io/kubelet-api-admin.yaml
name: rbac.addons.k8s.io
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
name: kubelet-api.rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
k8s-addon: kubelet-api.rbac.addons.k8s.io
version: v0.0.1
- manifest: limit-range.addons.k8s.io/v1.5.0.yaml
name: limit-range.addons.k8s.io

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
View File

@ -30,12 +30,12 @@ spec:
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
- id: kubelet-api-admin
- id: k8s-1.9
kubernetesVersion: '>=1.9.0'
manifest: rbac.addons.k8s.io/kubelet-api-admin.yaml
name: rbac.addons.k8s.io
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
name: kubelet-api.rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
k8s-addon: kubelet-api.rbac.addons.k8s.io
version: v0.0.1
- manifest: limit-range.addons.k8s.io/v1.5.0.yaml
name: limit-range.addons.k8s.io

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -30,12 +30,12 @@ spec:
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
- id: kubelet-api-admin
- id: k8s-1.9
kubernetesVersion: '>=1.9.0'
manifest: rbac.addons.k8s.io/kubelet-api-admin.yaml
name: rbac.addons.k8s.io
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
name: kubelet-api.rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
k8s-addon: kubelet-api.rbac.addons.k8s.io
version: v0.0.1
- manifest: limit-range.addons.k8s.io/v1.5.0.yaml
name: limit-range.addons.k8s.io

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -30,12 +30,12 @@ spec:
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
- id: kubelet-api-admin
- id: k8s-1.9
kubernetesVersion: '>=1.9.0'
manifest: rbac.addons.k8s.io/kubelet-api-admin.yaml
name: rbac.addons.k8s.io
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
name: kubelet-api.rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
k8s-addon: kubelet-api.rbac.addons.k8s.io
version: v0.0.1
- manifest: limit-range.addons.k8s.io/v1.5.0.yaml
name: limit-range.addons.k8s.io