Add metrics.k8s.io api group for members on pods and nodes

In addition, fix getting and listing hpa for members
Depends-On: https://review.opendev.org/731319/
Depends-On: https://review.opendev.org/731523/
Change-Id: I55d1eac14c7755ab65bba553ccd86980b4d7cd8a
This commit is contained in:
okozachenko 2020-05-27 19:09:40 +03:00
parent 3d5f126115
commit 404032427c
3 changed files with 67 additions and 10 deletions

View File

@ -17,6 +17,10 @@
name: rbac-helm-functional name: rbac-helm-functional
parent: apply-helm-charts parent: apply-helm-charts
run: playbooks/functional.yaml run: playbooks/functional.yaml
vars:
ensure_kubernetes_minikube_addons: [metrics-server]
minikube_dns_resolvers: [1.1.1.1, 8.8.8.8]
collect_kubernetes_logs_namespace: kube-system
- project: - project:
check: check:

View File

@ -18,9 +18,9 @@ kind: ClusterRole
metadata: metadata:
name: rbac-members name: rbac-members
rules: rules:
# List and get nodes # List and get nodes & pods & pod logs
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes", "pods", "pods/log"]
verbs: ["get", "list"] verbs: ["get", "list"]
# List all get applications # List all get applications
- apiGroups: ["apps"] - apiGroups: ["apps"]
@ -28,12 +28,9 @@ rules:
verbs: ["get", "list"] verbs: ["get", "list"]
# List and get hpa # List and get hpa
- apiGroups: ["autoscaling"] - apiGroups: ["autoscaling"]
resources: ["horizontalpodautoscaler"] resources: ["horizontalpodautoscalers"]
verbs: ["get", "list"] verbs: ["get", "list"]
- apiGroups: [""] # View resource usage for nodes and pods
resources: ["pods"] - apiGroups: ["metrics.k8s.io"]
verbs: ["get", "list"] resources: ["nodes", "pods"]
# View logs for pods
- apiGroups: [""]
resources: ["pods/log"]
verbs: ["get", "list"] verbs: ["get", "list"]

View File

@ -14,12 +14,34 @@
# limitations under the License. # limitations under the License.
- hosts: all - hosts: all
pre_tasks:
- name: Deploy a hpa for test
shell: |
cat <<EOF | kubectl apply -f-
apiVersion: autoscaling/v1
kind: HorizontalPodAutoscaler
metadata:
name: test
namespace: kube-system
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: test
minReplicas: 1
maxReplicas: 3
targetCPUUtilizationPercentage: 90
roles: roles:
- name: helm-template - name: helm-template
helm_release_name: rbac helm_release_name: rbac
helm_chart: charts/rbac helm_chart: charts/rbac
helm_wait_for_pods: false helm_wait_for_pods: false
helm_values_file: charts/rbac/test-values.yaml helm_values_file: charts/rbac/test-values.yaml
- name: wait-for-pods
vars:
wait_for_pods_namespace: kube-system
tasks: tasks:
- import_tasks: tasks/setup-test-context.yaml - import_tasks: tasks/setup-test-context.yaml
@ -48,3 +70,37 @@
# View logs for pods # View logs for pods
- name: Ensure getting logs for a pod works - name: Ensure getting logs for a pod works
shell: kubectl --context=test -n kube-system logs $(kubectl -n kube-system get pods -oname | head -1) shell: kubectl --context=test -n kube-system logs $(kubectl -n kube-system get pods -oname | head -1)
# List and get hpas
- name: Ensure listing hpas works
shell: kubectl --context=test -n kube-system get hpa
- name: Ensure getting a hpa works
shell: kubectl --context=test -n kube-system get hpa test
# List and get metrics for nodes
- name: Ensure listing resources of nodes
command: kubectl --context=test top nodes
register: _nodes_metrics
until: _nodes_metrics is success
retries: 60
delay: 5
- name: Ensure getting resources of a node
shell: kubectl --context=test top node $(kubectl get nodes --no-headers=true -o=custom-columns='name:metadata.name' | head -1)
register: _node_metrics
until: _node_metrics is success
retries: 60
delay: 5
# List and get metrics for pods
- name: Ensure listing resources for pods in a namespace
shell: kubectl --context=test -n kube-system top pods
register: _pods_metrics
until: _pods_metrics is success
retries: 60
delay: 5
- name: Ensure getting resources for a pod
shell: kubectl --context=test -n kube-system top pod $(kubectl -n kube-system --no-headers=true get pods -o=custom-columns='name:metadata.name' | head -1)
register: _pod_metrics
until: _pod_metrics is success
retries: 60
delay: 5