Update expected test-output

2023-06-18 19:47:46 -04:00 · 2023-06-18 19:47:46 -04:00 · 5abb7af3d9
parent 476f1661f7
commit 5abb7af3d9
195 changed files with 3 additions and 1285 deletions
--- 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:
--- 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
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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

--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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
--- a/Show More
+++ b/Show More