Commit 88b8d649 authored by Piotr Szczesniak's avatar Piotr Szczesniak

Removed hpa v1beta1 from bootstrappolicy

parent a35ad8f6
...@@ -133,8 +133,8 @@ func init() { ...@@ -133,8 +133,8 @@ func init() {
addControllerRole(rbac.ClusterRole{ addControllerRole(rbac.ClusterRole{
ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + "horizontal-pod-autoscaler"}, ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + "horizontal-pod-autoscaler"},
Rules: []rbac.PolicyRule{ Rules: []rbac.PolicyRule{
rbac.NewRule("get", "list", "watch").Groups(autoscalingGroup, extensionsGroup).Resources("horizontalpodautoscalers").RuleOrDie(), rbac.NewRule("get", "list", "watch").Groups(autoscalingGroup).Resources("horizontalpodautoscalers").RuleOrDie(),
rbac.NewRule("update").Groups(autoscalingGroup, extensionsGroup).Resources("horizontalpodautoscalers/status").RuleOrDie(), rbac.NewRule("update").Groups(autoscalingGroup).Resources("horizontalpodautoscalers/status").RuleOrDie(),
rbac.NewRule("get", "update").Groups(legacyGroup).Resources("replicationcontrollers/scale").RuleOrDie(), rbac.NewRule("get", "update").Groups(legacyGroup).Resources("replicationcontrollers/scale").RuleOrDie(),
// TODO this should be removable when the HPA contoller is fixed // TODO this should be removable when the HPA contoller is fixed
rbac.NewRule("get", "update").Groups(extensionsGroup).Resources("replicationcontrollers/scale").RuleOrDie(), rbac.NewRule("get", "update").Groups(extensionsGroup).Resources("replicationcontrollers/scale").RuleOrDie(),
......
...@@ -115,7 +115,7 @@ func ClusterRoles() []rbac.ClusterRole { ...@@ -115,7 +115,7 @@ func ClusterRoles() []rbac.ClusterRole {
rbac.NewRule(ReadWrite...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(), rbac.NewRule(ReadWrite...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(),
rbac.NewRule(ReadWrite...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale", rbac.NewRule(ReadWrite...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale",
"horizontalpodautoscalers", "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(), "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(),
// additional admin powers // additional admin powers
rbac.NewRule("create").Groups(authorizationGroup).Resources("localsubjectaccessreviews").RuleOrDie(), rbac.NewRule("create").Groups(authorizationGroup).Resources("localsubjectaccessreviews").RuleOrDie(),
...@@ -145,7 +145,7 @@ func ClusterRoles() []rbac.ClusterRole { ...@@ -145,7 +145,7 @@ func ClusterRoles() []rbac.ClusterRole {
rbac.NewRule(ReadWrite...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(), rbac.NewRule(ReadWrite...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(),
rbac.NewRule(ReadWrite...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale", rbac.NewRule(ReadWrite...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale",
"horizontalpodautoscalers", "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(), "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(),
}, },
}, },
{ {
...@@ -168,7 +168,7 @@ func ClusterRoles() []rbac.ClusterRole { ...@@ -168,7 +168,7 @@ func ClusterRoles() []rbac.ClusterRole {
rbac.NewRule(Read...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(), rbac.NewRule(Read...).Groups(batchGroup).Resources("jobs", "cronjobs", "scheduledjobs").RuleOrDie(),
rbac.NewRule(Read...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale", rbac.NewRule(Read...).Groups(extensionsGroup).Resources("daemonsets", "deployments", "deployments/scale",
"horizontalpodautoscalers", "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(), "ingresses", "replicasets", "replicasets/scale", "replicationcontrollers/scale").RuleOrDie(),
}, },
}, },
{ {
......
...@@ -123,7 +123,6 @@ items: ...@@ -123,7 +123,6 @@ items:
- daemonsets - daemonsets
- deployments - deployments
- deployments/scale - deployments/scale
- horizontalpodautoscalers
- ingresses - ingresses
- replicasets - replicasets
- replicasets/scale - replicasets/scale
...@@ -298,7 +297,6 @@ items: ...@@ -298,7 +297,6 @@ items:
- daemonsets - daemonsets
- deployments - deployments
- deployments/scale - deployments/scale
- horizontalpodautoscalers
- ingresses - ingresses
- replicasets - replicasets
- replicasets/scale - replicasets/scale
...@@ -780,7 +778,6 @@ items: ...@@ -780,7 +778,6 @@ items:
- daemonsets - daemonsets
- deployments - deployments
- deployments/scale - deployments/scale
- horizontalpodautoscalers
- ingresses - ingresses
- replicasets - replicasets
- replicasets/scale - replicasets/scale
......
...@@ -370,7 +370,6 @@ items: ...@@ -370,7 +370,6 @@ items:
rules: rules:
- apiGroups: - apiGroups:
- autoscaling - autoscaling
- extensions
resources: resources:
- horizontalpodautoscalers - horizontalpodautoscalers
verbs: verbs:
...@@ -379,7 +378,6 @@ items: ...@@ -379,7 +378,6 @@ items:
- watch - watch
- apiGroups: - apiGroups:
- autoscaling - autoscaling
- extensions
resources: resources:
- horizontalpodautoscalers/status - horizontalpodautoscalers/status
verbs: verbs:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment