dashboard and ingress charts vers upgrades

ReSearchITEng · Jan 13, 2021 · aa30330 · aa30330
1 parent a6ed8ac
commit aa30330
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/group_vars/all/addons.yaml b/group_vars/all/addons.yaml
@@ -30,7 +30,7 @@ helm:
   - { name: incubator, url: 'https://charts.helm.sh/incubator' }
   - { name: jetstack, url: 'https://charts.jetstack.io' } # cert-manager
 #  - { name: funkypenguin, url: 'https://funkypenguin.github.io/helm-kubernetes-dashboard' } #dashboard 2.0 (till PR kubernetes/dashboard#4502 merged in official repo)
-  - { name: kubernetes-dashboard, url: 'https://kubernetes.github.io/dashboard/' }
+  - { name: kubernetes-dashboard, url: 'https://kubernetes.github.io/dashboard/' } # https://artifacthub.io/packages/helm/k8s-dashboard/kubernetes-dashboard
   - { name: flexkube, url: 'https://flexkube.github.io/charts' } # calico helm chart till official will be ready: https://github.com/projectcalico/calico/issues/717 and https://github.com/projectcalico/calico/tree/master/_includes/charts/calico # plan to move to tigera-opearator
   - { name: rook-release, url: 'https://charts.rook.io/release' }
   packages_list: # when not defined, namespace defaults to "default" namespace
@@ -90,7 +90,7 @@ helm:
 ####################
 ## DASHBOARD 2.0 ###
 ####################
-    - { name: dashboard, repo: kubernetes-dashboard/kubernetes-dashboard, namespace: monitoring, options: '--set image.repository={{ images_repo | default ("docker.io") }}/kubernetesui/dashboard --set ingress.enabled=True,ingress.hosts[0]=dashboard.{{ custom.networking.dnsDomain }},ingress.hosts[1]={{ custom.networking.masterha_fqdn | default (groups["primary-master"][0]) }},ingress.hosts[2]={{ groups["primary-master"][0] }} --set nodeSelector."node\-role\.kubernetes\.io/infra=" --set tolerations[0].effect=NoSchedule,tolerations[0].key="node-role.kubernetes.io/infra" --set tolerations[1].effect=PreferNoSchedule,tolerations[1].key="node-role.kubernetes.io/infra" --set metricsScraper.enabled=true,metricsScraper.image.repository={{ images_repo | default ("docker.io") }}/kubernetesui/metrics-scraper --set rbac.create=True,rbac.clusterReadOnlyRole=True --set protocolHttp=true --version 3.0.0' } # https://github.com/kubernetes/dashboard/blob/master/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml#L17
+    - { name: dashboard, repo: kubernetes-dashboard/kubernetes-dashboard, namespace: monitoring, options: '--set image.repository={{ images_repo | default ("docker.io") }}/kubernetesui/dashboard --set ingress.enabled=True,ingress.hosts[0]=dashboard.{{ custom.networking.dnsDomain }},ingress.hosts[1]={{ custom.networking.masterha_fqdn | default (groups["primary-master"][0]) }},ingress.hosts[2]={{ groups["primary-master"][0] }} --set nodeSelector."node\-role\.kubernetes\.io/infra=" --set tolerations[0].effect=NoSchedule,tolerations[0].key="node-role.kubernetes.io/infra" --set tolerations[1].effect=PreferNoSchedule,tolerations[1].key="node-role.kubernetes.io/infra" --set metricsScraper.enabled=true,metricsScraper.image.repository={{ images_repo | default ("docker.io") }}/kubernetesui/metrics-scraper --set rbac.create=True,rbac.clusterReadOnlyRole=True --set protocolHttp=true --version 4.0.0' } # https://github.com/kubernetes/dashboard/blob/master/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml#L17
 
 ################
 ## Kured #######
@@ -107,7 +107,7 @@ helm:
 ## INGRESS NGINX ###
 ####################
 # (the new nginx ingress )
-    - { name: ingress-nginx, repo: ingress-nginx/ingress-nginx, namespace: kube-system, options: '--set hostNetwork=true --set controller.admissionWebhooks.enabled=false --set rbac.create=true,serviceAccount.create=true --set controller.stats.enabled=true,controller.metrics.enabled=true,controller.metrics.serviceMonitor.enabled=false --set controller.metrics.serviceMonitor.namespace=monitoring --set controller.metrics.serviceMonitor.additionalLabels.monitoring=prometheusoperator --set controller.tolerations[0].effect=NoSchedule,controller.tolerations[0].key="node-role.kubernetes.io/infra" --set controller.tolerations[1].effect=PreferNoSchedule,controller.tolerations[1].key="node-role.kubernetes.io/infra" --set controller.nodeSelector."node\-role\.kubernetes\.io/infra=" --set controller.kind=DaemonSet --set controller.service.type=ClusterIP --set-string controller.config.server-tokens=false --set controller.config.hide-headers=Server --set controller.image.registry={{ images_repo | default ("k8s.gcr.io") }} --set controller.image.repository={{ images_repo | default ("k8s.gcr.io") }}/ingress-nginx/controller --set controller.admissionWebhooks.patch.image.repository={{ images_repo | default ("docker.io") }}/jettech/kube-webhook-certgen --set defaultBackend.image.repository={{ images_repo | default ("k8s.gcr.io") }}/defaultbackend-{{ HOST_ARCH }} --version 3.12.0' } #https://github.com/kubernetes/ingress-nginx/blob/master/charts/ingress-nginx/Chart.yaml#L5    # PARAMS explained: https://kubernetes.github.io/ingress-nginx/deploy/baremetal/
+    - { name: ingress-nginx, repo: ingress-nginx/ingress-nginx, namespace: kube-system, options: '--set hostNetwork=true --set controller.admissionWebhooks.enabled=false --set rbac.create=true,serviceAccount.create=true --set controller.stats.enabled=true,controller.metrics.enabled=true,controller.metrics.serviceMonitor.enabled=false --set controller.metrics.serviceMonitor.namespace=monitoring --set controller.metrics.serviceMonitor.additionalLabels.monitoring=prometheusoperator --set controller.tolerations[0].effect=NoSchedule,controller.tolerations[0].key="node-role.kubernetes.io/infra" --set controller.tolerations[1].effect=PreferNoSchedule,controller.tolerations[1].key="node-role.kubernetes.io/infra" --set controller.nodeSelector."node\-role\.kubernetes\.io/infra=" --set controller.kind=DaemonSet --set controller.service.type=ClusterIP --set-string controller.config.server-tokens=false --set controller.config.hide-headers=Server --set controller.image.registry={{ images_repo | default ("k8s.gcr.io") }} --set controller.image.repository={{ images_repo | default ("k8s.gcr.io") }}/ingress-nginx/controller --set controller.admissionWebhooks.patch.image.repository={{ images_repo | default ("docker.io") }}/jettech/kube-webhook-certgen --set defaultBackend.image.repository={{ images_repo | default ("k8s.gcr.io") }}/defaultbackend-{{ HOST_ARCH }} --version 3.19.0' } #https://github.com/kubernetes/ingress-nginx/blob/master/charts/ingress-nginx/Chart.yaml#L5    # PARAMS explained: https://kubernetes.github.io/ingress-nginx/deploy/baremetal/
 
 ####################
 ## NGINX INGRESS ###