C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update metrics-server tag and template (#6090)

Browse source
This commit is contained in:
Florian Ruynat 2020-05-11 12:55:50 +02:00 committed by GitHub
parent c87bd53352
commit 7c00ce5f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/download/defaults/main.yml
View file

@ -417,7 +417,7 @@ registry_image_repo: "{{ docker_image_repo }}/library/registry"
registry_image_tag: "2.7" registry_image_tag: "2.7"
registry_proxy_image_repo: "{{ kube_image_repo }}/kube-registry-proxy" registry_proxy_image_repo: "{{ kube_image_repo }}/kube-registry-proxy"
registry_proxy_image_tag: "0.4" registry_proxy_image_tag: "0.4"
metrics_server_version: "v0.3.6" metrics_server_version: "v0.3.7"
metrics_server_image_repo: "{{ kube_image_repo }}/metrics-server-{{ image_arch }}" metrics_server_image_repo: "{{ kube_image_repo }}/metrics-server-{{ image_arch }}"
metrics_server_image_tag: "{{ metrics_server_version }}" metrics_server_image_tag: "{{ metrics_server_version }}"
local_volume_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/local-volume-provisioner" local_volume_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/local-volume-provisioner"

2
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View file

@ -27,6 +27,7 @@ spec:
containers: containers:
- name: metrics-server - name: metrics-server
image: {{ metrics_server_image_repo }}:{{ metrics_server_image_tag }} image: {{ metrics_server_image_repo }}:{{ metrics_server_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
command: command:
- /metrics-server - /metrics-server
- --logtostderr - --logtostderr
@ -74,6 +75,7 @@ spec:
runAsUser: 10001 runAsUser: 10001
- name: metrics-server-nanny - name: metrics-server-nanny
image: {{ addon_resizer_image_repo }}:{{ addon_resizer_image_tag }} image: {{ addon_resizer_image_repo }}:{{ addon_resizer_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
resources: resources:
limits: limits:
cpu: {{ addon_resizer_limits_cpu }} cpu: {{ addon_resizer_limits_cpu }}

32
roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
View file

@ -5,23 +5,15 @@ metadata:
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
- pods - pods
- nodes - nodes
- nodes/stats - nodes/stats
- namespaces - namespaces
verbs: - configmaps
- get verbs:
- list - get
- watch - list
- apiGroups: - watch
- "apps"
resources:
- deployments
verbs:
- get
- list
- update
- watch