diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index ab6bda3155..3b6a854ea5 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 3f06eeb86f..64416703c2 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -37,9 +37,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -52,9 +49,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5be69e378a..1de17e7a44 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index 0dfd1c66b5..36417fc0e0 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3106fa883a..796b04945e 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index 3b5bbb1882..399b72a38a 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -47,9 +47,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -59,9 +56,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 1b33631285..fac10d48cc 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index dcbf62d7a2..05739723cf 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index 34f06e4920..2a9a2558fe 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index 4cbea3f452..0bdf9b1b88 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -67,9 +67,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -79,9 +76,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index 54b3e1bd4b..a2f3f07b1d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index 8ba79481c6..2fa21f3cb6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -60,9 +60,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -72,9 +69,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 64d02e8d98..6d1945bd26 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -139,16 +139,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 8a1e398908..fc8fa96e5a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -65,9 +65,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -77,9 +74,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index 64e361d0ad..655e0d6d39 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -131,7 +131,7 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWX2/bNhB/96cgOvStkewm7VahL6qdJVpi17OTZXsKaPIsc6FI7Ugq8T79cJRkO2k6bBhW9KEIEIt3x+P9+d2PFNoGObZmrcpswFjFDS9h6S3yEsaaOwcuYx4DDMAI3NZeWdOZMxO0HoAXcqyD84COPEADxsev3hu2C8ZWXNyFegEeDLmZ8K3L2LthpwXT9IZHzPAKMnZ6NZ7cTvNZfna6uJ3kxeVvtx/y8cX1fHm7OL06nV0VH2fdFsYargOQPxlFDaBT1mTsOHmTvIupKfPVhXUXVpDPiyVg0wbEtbb3c1SN0lCC7GrPGDfWbCsbXB78JmNrrl0U1yoPUoEREGt+xMgjGvDgEteIRMKaB+1b0/aYsQ3GZ2xEsuA3FtWfnBKfWgkZy/U937qcwhgwtlJG5lIiOJexYRL/BoxF1MzRNkoCZgwePKDhmtpv+EpDLivlKM+5DqUyXWgzXoGruYBLtQaxFRqi+FJVyi+4KQHjmqJUAnIhKNAomrRZHOLyUH5lNWDMYQnCGtkqp8Fzr0y5C+YGVhtr76LyF66V/Lx6ZiUswHlUgtxG2QKcDSjg52A9p1S9kG1Fu/w23tcuS9PR6+9jpUbZyXA4emz5sQFEJftupe24fPfs1tcDxtbAfUA44x66oRovi6kq23Tzm2XGXhBEXkRdYa4QoC16frO8NgilotE8sFIVLyFjrQa3yd0PLlE2Jdwc8Vq5ForNKHn9NvaaFBr8HGENiNDD4Wpb90kUpm1/MY/Lc+s8DUpcnD4c6LQtL6EBnTFKDeGPAM5vgEvACDiQESKtV16WCCX3Fp/anj545Ofxk6JSD/2WX48WUFkPR9Hi6Om+M7Shbvc93RBVT+2vHYVewfNbSDtgzIEICHOLPmMnJ8dRcojfwrlA9e87zGuVqK5gibBVTcVM4IFXtQYSfOLhp5uL5fWi+BcuUluDUTJtRunv93du77Ej6mIexy1jo+EweXtCiEtHMfR2wD5wcQdGZhG4x5GkxtZ4tFoDTvfsSWQluAealnExWbg9XXnPxWYC9H9BMymUhuXWiDmgsjJjo2ro/pZIRBsquW3jfPe2jXO0V84iHX+miCLeUgFhTGcsbKAJ2hHnl50rsaveUX/57AdMt6DWEKmmDeZAtqvp4+kJDh4T5RhB0g3Gdd8GOnopNiCDbvv1ZZN2u6P/W64dAWWfvwVFSeM7QUXMxdzWeajkTr6w1mcs/Sdom8yWB0MxGh5obHw/9MuEgL+/7yawCmWpTHnOjdTEFX0i0LQ3yDlHmbEKKovbhDdcadr3fjQcTtUrYyWs3SPxy16o6Nf9iADv37x8Fev9iWkvfWT7v/SbetEO1pxTB9KGY6rVKu2alO4NPkFsbWVh1siJSrgygMXz4Kl5cJAdx0dbbeWUG7UG57sDwYt0/8ZJq05LZFKj9SD8Bel09zTYd6LPppsIKt5O5zbBS3tvzpAL6CnqODLUM6oxKq8E13MrHcHFDSpOni++AfUbUL9uoP4FAAD//wEAAP//uEYSRu8NAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ1ad9V6I1nd43XOvPsZNktTR7LnClSOySVeL9+OKRkO1/DhmLFLooAsXS+eD6e81BC2yAn1mxUVQ4Yq7nhFay8RV7BRHPnwJXMY4ABGIH7xitrOnNmgtYD8EJOdHAe0FEEaMH4+NRHw/TC2JqLXWiW4MFQmCnfu5K9G0VtC+iUNSU7y95k72ImynxplF1Yw3gxWwG2yZ9rbW8XqFqloQLZVcYYN9bsaxvcOPhtyTZcuyhu1DhIBUZArGjIKCIa8OAy14pMwoYH7ZNpOmZig/ElK0gW/Nai+oNTnnMroWRjfcv3bkxpDBhbKyPHUiI4V7JRFv8GjMWZLNC2SgKWDO48oOGammv4WsNY1spRnQsdKmW61C55Da7hAj6rDYi90BDFn1Wt/JKbCjC+U5ZKwFgISjSKpqmK06mfyq+sBow1rEBYI5NyHjz3ylSHZG5gvbV2F5W/cK3k8+pLK2EJzqMSFDbKluBsQAE/B+s5leqFTB3t6tt637gyz4vX/4+dKsrz0ai4b/lTC4hK9tPKExj/96Tr6wFjG+A+IHzkHjrITlazuapSueObVcleEEReRN3MXCFAavr4ZnVtECpFwD+xUjWvoGRJg/ts953LlM0JN0PeKJeg2BbZ67dx1qTQ4BcIG0CEHg5X+6YvYmbS+GeL+HphnTe8TsP9cHei07b6DC3oklFpCL8HcH4LXAJGwIGMEElReVUhVNxbfGj74c4jv4iPlJW6611+HS6hth6G0WL40O8j2tAkv4cOUfXQ/tpR6jU87ULaAWMOREBYWPQlOz8/i5JT/M6cC9T/fsK8UZnqGpYJWzfUzAzueN1oIMGjCD/efFpdL2f/IERuGzBK5m2R/3a7c8eIHQ3OFnHdSlaMRtnbc0JcXsTU04J9z8UOjCwjcM8iSU2s8Wi1BpwfyY7ISnAPtC2T2XTpjnTlPRfbKdD/Je2kUBpWeyMWgMrKkhX1yP0lkYiUKoVNeb57m/IsjkpCS8meaaKId0BAmNAZSxtogw7E+XX3Shy6N+zviuOC6QRqDZFqUjInskNP729PcHCfKCcIki4crvsx0NErsQUZdJrX1y3aHY7+slo7AiqfvwVFRes7RUXMxdzeeajlQb601pcs/ztom16uTpaiGJ1obLzu+9eMgH+876awDlWlTHXBjdTEFX0h0KYb5IKjLFkNtcV9xluuNPm9L0ajuXplrISNuyd+2QsV/bofEOD9m5evYr8fmfbSe7b/yrxpFmmxFpwmkLccc63WeTek/GjwCLGNlTOzQU5UwpUBnD0NnoYHB+VZ/MZqrJxzozbgfHcgeJEfv3HyutMSmTRoPQj/iXS6+zQ4TqKvptsIat5B57bBS3trPiIX0FPUWWSoJ1QTVF4JrhdWOoKLG9ScIn/6BtRvQP1vA/VPAAAA//8BAAD///QUjT9NDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml echo "H4sIAAAAAAAA/2zOy07DMBCF4b2fwi+QGlBpkSU2tSouoWkEiMtysCcQsD2WxyY8PkJZRWL/fzrHeKquz/Q9OsxawsTC+MoFcwcBtbQUUkbmFf5ASB5XloIwFIfxfQeMWgYMA2ul7KwWofpX30QuEC1eZappXgnwZ5vKTUEuzSkso3vyqKWhWDL53kNE0ZHDmuYj18AfWsKtfWb7eH7yNb08HQ+vb+N2bTbr3dRuHrbd51m7P7RO+Yvj3f5S/AIAAP//AQAA//9FlrBE9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index 3d3c3ea0ee..e76e3af385 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index c552f32369..851b608719 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index 806094cc70..eb3d784c20 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -51,9 +51,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -63,9 +60,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 5bfef96c3f..7027343750 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index 0789f359d0..b14f6e0529 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index 04781d13ed..bfd8253735 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 8cdcee0769..6b7940dde6 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data index 5dd9a7ddd8..67962dc2ef 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content index 4c54b8f418..0bbcae4cfc 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content @@ -49,9 +49,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -61,9 +58,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 9505805b2a..50cf9f71d9 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index b9aa3c6ff6..b3042329f8 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index dfe7f7b98d..6fdfb5cad2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index 5c374597fc..3f4c1ec0b0 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -47,13 +47,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -67,13 +60,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 198bbe465c..01f8b89cee 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index d4e4885550..01f8b89cee 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 7297120296..c9117a8483 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 593fc99c4f..c9117a8483 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 482f69dfaf..a9869c3df6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index 7df987cd52..458929783e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 170ee241aa..3d180277b3 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index 74bf0e275c..ef095411d1 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -50,13 +50,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -70,13 +63,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 0ca4013912..ac0ff1a260 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index de4ec3c626..ac0ff1a260 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 905560320f..0c4ed824e8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index aa52e7054d..0c4ed824e8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0a329484e6..0624dbfea4 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index b915662369..5b2cce7039 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3106fa883a..796b04945e 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index fe706116df..6610cb5dde 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index 6a87f63448..419f1baf2f 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index 542167af5d..bd014adf6e 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index c21782eb3f..b75592d2bc 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index ed3fd536fd..02c81a2caf 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -51,9 +51,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -63,9 +60,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index c71cfdf8f2..ba835c3c0a 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index b920b5b3df..bac46d611d 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index bf558b3b33..d6c5dc3c84 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index 3f5f295a1e..ae5964c7b8 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -47,13 +47,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -67,13 +60,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 68ec4a4ad2..a5d47ffe45 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 39146b97d5..a5d47ffe45 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index ab9b14f104..16d0300581 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 90e64dce55..16d0300581 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index ae7e941262..baae482855 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -51,13 +51,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -73,13 +66,6 @@ spec: name: c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content index 47c4d88c20..e94c2a19e7 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content index b154054f76..e94c2a19e7 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content index 002caa4d0c..1f5a611469 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content @@ -19,8 +19,6 @@ spec: --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content index d58dae489f..1f5a611469 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content @@ -19,10 +19,6 @@ spec: --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 8cd968c71d..361d196815 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -130,26 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 68a51ecc9b..b6844d91e8 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -130,26 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 28e47fdf2b..7f354421cd 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -130,26 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3106fa883a..796b04945e 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 3d8d9c3bda..023b60f8db 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 01cc608f55..fe98a3710a 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index d962c117be..e5317f2f22 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 74d6775b35..f58205d815 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index 8466781266..af04af3b37 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -63,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -75,9 +72,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 924a87d291..21a7ec36f8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index 8083d3ff2f..766b6a2d08 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -63,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -75,9 +72,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 97b1f843e1..864f566d3a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index 679ffa42dc..9f49d27d8e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -64,9 +64,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -76,9 +73,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 932f9be168..3c3d6aae88 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index b416959b3c..5ce0aec937 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -63,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -75,9 +72,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 655ed9dfd2..5f6df460ea 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 8b1328495e..1c3a73dbf9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -63,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -75,9 +72,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d837e7d8ec..668e2fd67d 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index 8dc537c40a..10261cf193 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -63,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -75,9 +72,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index d98508d032..d01cc66ced 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -64,9 +64,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -78,9 +75,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script index 41cc01349f..8b811cecb0 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d837e7d8ec..668e2fd67d 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 55d13d6fa3..23144a1c99 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -64,9 +64,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -76,9 +73,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 43d60fabe0..d3c913da0e 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content index c1c770b874..f5122f572e 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content @@ -37,9 +37,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -52,9 +49,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 25fcbeab93..2689d36996 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index ea7ac6b46a..4cc9f1b026 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -46,9 +46,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -61,9 +58,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 859e02d15c..40ac76a66c 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index ab7c00be31..2b7c558418 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -60,9 +57,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b8d772492c..a8e94fcd37 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index 518a9cbd30..a547a66d19 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -60,9 +57,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f1cdea1597..2b9156a6c1 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index 970e0deff0..4cc720093e 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -60,9 +57,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e85b4071c9..ac135706e7 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index 4a2d107f8c..b015015758 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -46,9 +46,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -61,9 +58,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index c7333d4142..2fd60644aa 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -136,8 +136,6 @@ etcdClusters: env: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc version: 3.5.9 main: @@ -146,9 +144,6 @@ etcdClusters: volumeSize: 20 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index 870c75f302..9511ccc262 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -44,9 +44,6 @@ spec: volumeSize: 20 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 name: main @@ -62,8 +59,6 @@ spec: env: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 712664399c..b974e98117 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -20,10 +20,10 @@ spec: --volume-tag=kubernetes.io/cluster/minimal-etcd.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION - value: 1d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d + - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION + value: 1d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 95488ec858..3a9e98f8ba 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,9 +133,6 @@ etcdClusters: volumeSize: 20 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: etcdMembers: @@ -143,9 +140,6 @@ etcdClusters: volumeSize: 50 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index b9a374fed0..01a3f36342 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -47,9 +47,6 @@ spec: volumeType: gp3 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -61,9 +58,6 @@ spec: volumeType: gp3 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index d4310a4cbf..35226a4779 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index 72bd7f6c8d..658e6e5c79 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index e85c6e957e..4a0c2782e3 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index 82f92431e4..19756fc2e3 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 10f86caf8f..9dd528956b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index 2aeda6960c..f6d0a73a56 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 10f86caf8f..9dd528956b 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 5ce31603e1..80a80bbd4d 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 9e69fd780a..ebd6511e44 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index c73e38b8ae..a22766d26d 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 07df3aaafb..54b9fdd709 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 8b1295882f..88e0c511bd 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5c426ab147..f526755ddd 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index f54a841af1..55a86af504 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index 5d213e7e07..03bb9978ac 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -47,9 +47,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -61,9 +58,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index a42b32f213..d0e2463a7f 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content index f7040d1ad0..768efc2b52 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -50,9 +50,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -64,9 +61,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 4630c853c9..cc56a1be62 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index 0199436033..b6310ea1e6 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -51,9 +51,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -65,9 +62,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script index 137465e284..d84aa84e65 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index ceae02c5d7..8d6b46ae23 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -51,9 +51,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -65,9 +62,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 8bc09848d8..9ec04d0ab6 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index a931495da0..51a85a439c 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -47,9 +47,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -61,9 +58,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 8bc09848d8..9ec04d0ab6 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content index 4bccb0fd58..85c870caa2 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -51,9 +51,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -65,9 +62,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script index 591ddfa012..62d9fa9778 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index 5a7d1237d3..bf6b12d401 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -47,9 +47,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -61,9 +58,6 @@ spec: name: a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 61f8ba179c..248cc16376 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -130,18 +130,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 07ead208be..4056ad5e8d 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index 51b8ff4fc2..fa1db50b92 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -42,9 +42,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -54,9 +51,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 8bc7072e5b..9d7b3597a1 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 5eb507786c..066c045d46 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -42,9 +42,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -54,9 +51,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content index 9f00c64148..db965b350e 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -42,9 +42,6 @@ spec: name: etcd-1 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -56,9 +53,6 @@ spec: name: etcd-1 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index ceb40bee5a..71e2c10bf4 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -131,18 +131,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content index 48b166ebce..d308da4651 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content @@ -33,9 +33,6 @@ spec: name: etcd-1 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: main version: 3.5.9 @@ -47,9 +44,6 @@ spec: name: etcd-1 manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi name: events version: 3.5.9 diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data index ece8128420..cefe716297 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data @@ -133,18 +133,12 @@ etcdClusters: cpuRequest: 100m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 main: cpuRequest: 200m manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d memoryRequest: 100Mi version: 3.5.9 kubeAPIServer: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 14ca2ced25..a8d5899ca2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index f13be00295..6daa2ff8f2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 7d3c9f0d7a..8a32d3a13d 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index 8e32766e9f..2888b52f6c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -47,13 +47,6 @@ spec: name: us-test-1c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -67,13 +60,6 @@ spec: name: us-test-1c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index d19b169963..f4270aee91 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 7978781def..f4270aee91 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 8a29333b76..4890768ff3 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index ce864bf4ba..4890768ff3 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 14ca2ced25..a8d5899ca2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index f13be00295..6daa2ff8f2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 7d3c9f0d7a..8a32d3a13d 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -130,24 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index 8e32766e9f..2888b52f6c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -47,13 +47,6 @@ spec: name: us-test-1c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -67,13 +60,6 @@ spec: name: us-test-1c manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index d19b169963..f4270aee91 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 7978781def..f4270aee91 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 8a29333b76..4890768ff3 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -20,8 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index ce864bf4ba..4890768ff3 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -20,10 +20,6 @@ spec: --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: registry.k8s.io/etcdadm/etcd-manager-slim:v3.0.20230516 diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 47e3c995b9..1b4887daf8 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index baf2946f7a..1662bb7703 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 9d3a8f6f0a..165be1e0a6 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index 466dba8abe..e0a287b747 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3097e70d7e..61a0d62ad1 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index fe64c34825..8fbf24a5af 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -46,9 +46,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -58,9 +55,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index 180c9166a8..de02710a61 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index 78a1d334f6..b9e0e19ba1 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 0a8232c529..4a5a80d36d 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index d7523c8b7e..50ff333b83 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index caa48dea62..ab1397f049 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index 1b1cc91aba..d29a67830c 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index 45250d3247..45856bfbce 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 7f5137b8eb..250d4ccaf5 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 98a87ad745..dd71f2ec3c 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index fe98841f1b..73f33d1879 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index b142f2cea0..b70fa7f8e5 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index b6543f7bbc..e33caefa11 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 4229455478..111abe01f2 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index 54fb8dd212..f37fc29fb1 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index ed3291baae..f407aa5930 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -130,23 +130,14 @@ etcdClusters: cilium: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index 6d353071f6..f49483f64f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 - backups: @@ -69,9 +63,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: cilium version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 326b41d395..26014b5091 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 83d9e7553d..84b8dacbc7 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index bd2c8bf144..677244f69a 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 071306c409..7568e23761 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index 079affe517..9cb8eb3c3c 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index d2aa085652..6126c9c900 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 267a74b2f2..2f927c448e 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index 2e577d09a4..74e67d325c 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 81ff441f3e..99b2663aea 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index 6398781af6..daf59aab32 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -44,9 +44,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -56,9 +53,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index a2c9a0731f..62283d45de 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index 3a4bfc4fad..459acd08c2 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index bb33962d42..5bbb916c30 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index cda23ecca4..d9cf87b281 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 10f86caf8f..9dd528956b 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index efd22c5ed3..8f05f90f3d 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -48,9 +48,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -60,9 +57,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index 3fdbc96b0a..f0b8af0cc7 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index a28df22362..2da432e627 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -45,9 +45,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -57,9 +54,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3106fa883a..796b04945e 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,16 +130,10 @@ etcdClusters: events: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 main: manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d version: 3.5.9 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index dff1846961..6d84435e54 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -43,9 +43,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: main version: 3.5.9 - backups: @@ -55,9 +52,6 @@ spec: name: us-test-1a manager: backupRetentionDays: 90 - env: - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 90d name: events version: 3.5.9 externalDns: