From 7e1873d927e4938bcf6121ecdbd1587f1b0948b3 Mon Sep 17 00:00:00 2001
From: ishizuka <ishizuka.ayaka@moneyforward.co.jp>
Date: Thu, 25 Nov 2021 01:56:21 +0900
Subject: [PATCH] DeprecationWarning occurs when indentfirst=None is specified
in coredns-config.yml.j2 (#8224)
---
roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 | 2 +-
.../ansible/templates/nodelocaldns-config.yml.j2 | 2 +-
.../cert_manager/templates/cert-manager.yml.j2 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
index 800fa44b4..337e87663 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
@@ -65,5 +65,5 @@ data:
}
{% if dns_etchosts | default(None) %}
hosts: |
- {{ dns_etchosts | indent(width=4, indentfirst=None) }}
+ {{ dns_etchosts | indent(width=4, first=False) }}
{% endif %}
diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
index 0244c04a4..5f9027caa 100644
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
@@ -163,5 +163,5 @@ data:
{% endif %}
{% if dns_etchosts | default(None) %}
hosts: |
- {{ dns_etchosts | indent(width=4, indentfirst=None) }}
+ {{ dns_etchosts | indent(width=4, first=False) }}
{% endif %}
diff --git a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2 b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2
index 3f51b19ad..d1ef39032 100644
--- a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2
@@ -879,7 +879,7 @@ spec:
apiVersion: v1
data:
internal-ca.pem: |
- {{ cert_manager_trusted_internal_ca | indent(width=4, indentfirst=False) }}
+ {{ cert_manager_trusted_internal_ca | indent(width=4, first=False) }}
kind: ConfigMap
metadata:
name: ca-internal-truststore
--
GitLab