Remove fsGroupPolicy as it is immutable

2022-10-05 18:23:10 +02:00 · 2022-10-05 18:23:10 +02:00 · 18808486da
parent b37ae0744f
commit 18808486da
56 changed files with 30 additions and 56 deletions
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: c3b4c30452a4651271690f9e6d228ff9ad41509873e5606fb3f6e8b7268a5a0c
+    manifestHash: 082b9ea3d64c5d5f74fbcdd1375dabd721e4c13f0cf2491540f7c61fda33f4b7
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -48,7 +48,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ba7158ec0cc65552611b73242fe9a7dd1aecd4c7f167485cd536698f49455c15
+    manifestHash: c8a6377aad793a3baa652226912a616d2a53673c6fa7127ad7bc4d6dd53beb16
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
@ -69,7 +69,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 76d9c4a6f64afd71894cf48619861c1eb1bfa27d1a50d440e3244d4bd53dc276
+    manifestHash: 1464ad0339bc442b793cb313cf917bc989c4186d79386049eb2ec6d3b2d44370
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -835,7 +835,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: d98496d48c370dfe2b031df2bf3609cb5ffc99a678618ea54b5b5138a387545c
+    manifestHash: 25e26ff1caccfbba2d85b8498f760f8e23bb4fc17ef37d2d31d8ba2b715f8a59
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -858,7 +858,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -127,7 +127,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: d22528fa219becc9d58ea06b8f5e3a6c0c13907cfae224dc87f4dbea05eebd9f
+    manifestHash: 15277961e3a312fbf4c313a0ddb1d14b79f220681c7e0ec8cb32c5d27f8693bb
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -858,7 +858,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -134,7 +134,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5230f59251b647235a9ff170a895795fc841e02175e04dcfcc92dff442dedf2a
+    manifestHash: 33d818bfb86253f14be66f67f09eb4aef406f42d2cd6a8dd8912a8ca6876f0ad
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -858,7 +858,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -134,7 +134,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5230f59251b647235a9ff170a895795fc841e02175e04dcfcc92dff442dedf2a
+    manifestHash: 33d818bfb86253f14be66f67f09eb4aef406f42d2cd6a8dd8912a8ca6876f0ad
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -858,7 +858,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -134,7 +134,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5230f59251b647235a9ff170a895795fc841e02175e04dcfcc92dff442dedf2a
+    manifestHash: 33d818bfb86253f14be66f67f09eb4aef406f42d2cd6a8dd8912a8ca6876f0ad
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -858,7 +858,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -127,7 +127,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5230f59251b647235a9ff170a895795fc841e02175e04dcfcc92dff442dedf2a
+    manifestHash: 33d818bfb86253f14be66f67f09eb4aef406f42d2cd6a8dd8912a8ca6876f0ad
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -808,7 +808,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -127,7 +127,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 661d07408b14f375f94fedfb70702c1d2ffe25b4bbaa9661bd5dfd3dc4eda7bb
+    manifestHash: 854f6313ece082ef0ae198fb2903be9820772ff6e6edd23f4467cbf249055fb3
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -808,7 +808,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -120,7 +120,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 661d07408b14f375f94fedfb70702c1d2ffe25b4bbaa9661bd5dfd3dc4eda7bb
+    manifestHash: 854f6313ece082ef0ae198fb2903be9820772ff6e6edd23f4467cbf249055fb3
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 2353cd18b634768470d664b7e1d2f8bb01dac0b4384be752d49a85072b0507aa
+    manifestHash: de2904daaac0ebe91253582f5d667687908f25b1d56471f5f50836b89f4894e5
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 2353cd18b634768470d664b7e1d2f8bb01dac0b4384be752d49a85072b0507aa
+    manifestHash: de2904daaac0ebe91253582f5d667687908f25b1d56471f5f50836b89f4894e5
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 2353cd18b634768470d664b7e1d2f8bb01dac0b4384be752d49a85072b0507aa
+    manifestHash: de2904daaac0ebe91253582f5d667687908f25b1d56471f5f50836b89f4894e5
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 2353cd18b634768470d664b7e1d2f8bb01dac0b4384be752d49a85072b0507aa
+    manifestHash: de2904daaac0ebe91253582f5d667687908f25b1d56471f5f50836b89f4894e5
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -797,7 +797,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -111,7 +111,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5a251d8372600af7a6e82a17c0e866bc54ffc2d0870ef7bfc7581ee5ecf36ea4
+    manifestHash: 79adad37822db36ef9155c94309de0edffe10fc6d2d951857bda6e17abc7d8d4
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -797,7 +797,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -63,7 +63,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 3b7a5812c59970975a60b4dc5af1bba7b3fb50cd00b46303a8df02b62f43c543
+    manifestHash: ac84639b81ae527b474592bad5a452a83763a5b4430eda023ff632a654d105fa
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -797,7 +797,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 5a251d8372600af7a6e82a17c0e866bc54ffc2d0870ef7bfc7581ee5ecf36ea4
+    manifestHash: 79adad37822db36ef9155c94309de0edffe10fc6d2d951857bda6e17abc7d8d4
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -797,7 +797,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 3b7a5812c59970975a60b4dc5af1bba7b3fb50cd00b46303a8df02b62f43c543
+    manifestHash: ac84639b81ae527b474592bad5a452a83763a5b4430eda023ff632a654d105fa
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
@ -56,7 +56,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 8b90941c7c39242d3d2a1cab2e844b4bc755f9754400ce8ef0cbddf885c861ef
+    manifestHash: eec2fa5beee9cb6db729a5422708d64b93e915595090e671e3f9556a4808ed84
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
@ -111,7 +111,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 30323bd98f5eba2ca13818534d43921937d8982ebc4346fce4620bdc6f4ac148
+    manifestHash: 8ab6ba6f9139d7c0702c760735e1f60221e0ae8357aa194ba53ffa38a6ccec93
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
@ -111,7 +111,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: b245f6af728f8f6d427769ec230d6f48585664a2a909d135d8ef2802f440c19d
+    manifestHash: 4e9eab8bc500c8001fc73bc65516e5419be6e2c4fb08b7e1dafd36af416682b7
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@ -77,7 +77,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 4213545841a7284f916f72236a63b77f4d669bdf88a6dfdc6080b9bce0dc0f06
+    manifestHash: c829620f323ab96815d83dd50c63672793e822b564ec9e12d81dc759b1b8368f
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -793,7 +793,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content
@ -107,7 +107,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 7395cd1b0f44769155a89e91c710199dd5fe4551cd77c464506123bfd6b72b1b
+    manifestHash: b8fa0442d9a75f10858022debd15c584fb71cc2734f6a4e64e791598964b33b2
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -835,7 +835,6 @@ metadata:
  name: ebs.csi.aws.com
 spec:
  attachRequired: true
-  fsGroupPolicy: File
  podInfoOnMount: false

 ---
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: d98496d48c370dfe2b031df2bf3609cb5ffc99a678618ea54b5b5138a387545c
+    manifestHash: 25e26ff1caccfbba2d85b8498f760f8e23bb4fc17ef37d2d31d8ba2b715f8a59
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
+++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
@ -622,7 +622,6 @@ metadata:
 spec:
  attachRequired: true
  podInfoOnMount: false
-  fsGroupPolicy: File
 ---
 {{ if IsKubernetesGTE "1.23" }}
 apiVersion: policy/v1
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ba7158ec0cc65552611b73242fe9a7dd1aecd4c7f167485cd536698f49455c15
+    manifestHash: c8a6377aad793a3baa652226912a616d2a53673c6fa7127ad7bc4d6dd53beb16
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@ -56,7 +56,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ba7158ec0cc65552611b73242fe9a7dd1aecd4c7f167485cd536698f49455c15
+    manifestHash: c8a6377aad793a3baa652226912a616d2a53673c6fa7127ad7bc4d6dd53beb16
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
@ -63,7 +63,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ba7158ec0cc65552611b73242fe9a7dd1aecd4c7f167485cd536698f49455c15
+    manifestHash: c8a6377aad793a3baa652226912a616d2a53673c6fa7127ad7bc4d6dd53beb16
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
@ -70,7 +70,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ba7158ec0cc65552611b73242fe9a7dd1aecd4c7f167485cd536698f49455c15
+    manifestHash: c8a6377aad793a3baa652226912a616d2a53673c6fa7127ad7bc4d6dd53beb16
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
@ -48,7 +48,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 07673c0be4a4eb62cff124e75750b7e91ca29f644c3a4db5bfb40677a4c34f60
+    manifestHash: a91f59a1094c4f0479133725bae8eb274a6bdff6b133fd08f7445324c0a451c5
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io