Add missing namespace for aws-ebs-csi-driver pdb template

Signed-off-by: Gabriel Martinez <gabrielmartinez@sisti.pt>
2021-11-23 09:39:23 +00:00 · 2021-11-23 09:39:23 +00:00 · 881bc5ca44
parent 6018f9b2fd
commit 881bc5ca44
22 changed files with 24 additions and 13 deletions
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -818,6 +818,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -133,7 +133,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: ab6e7bdfe63fd878acd739297ae675d839f81e316064a4bd1beaee671ed34e76
+    manifestHash: ef8dedd6651c52df4fcdd5d963b0ef972219cc80df4779594eef975c1852f45a
    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_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -762,6 +762,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -133,7 +133,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824
+    manifestHash: a0e50aa57e7960cdac1cabed70ef1c9305f02a52c3e8a19f04f552a72b4cbdae
    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_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -762,6 +762,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -126,7 +126,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824
+    manifestHash: a0e50aa57e7960cdac1cabed70ef1c9305f02a52c3e8a19f04f552a72b4cbdae
    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_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -762,6 +762,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -54,7 +54,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824
+    manifestHash: a0e50aa57e7960cdac1cabed70ef1c9305f02a52c3e8a19f04f552a72b4cbdae
    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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -768,6 +768,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -68,7 +68,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235
+    manifestHash: edc33ed36e982fcfcda326921649e7134ee645a64e7de771b6afee0d72ee3a4d
    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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -768,6 +768,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.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: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235
+    manifestHash: edc33ed36e982fcfcda326921649e7134ee645a64e7de771b6afee0d72ee3a4d
    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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -768,6 +768,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -61,7 +61,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235
+    manifestHash: edc33ed36e982fcfcda326921649e7134ee645a64e7de771b6afee0d72ee3a4d
    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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -768,6 +768,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content
@ -61,7 +61,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235
+    manifestHash: edc33ed36e982fcfcda326921649e7134ee645a64e7de771b6afee0d72ee3a4d
    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_bucket_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_bucket_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -762,6 +762,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.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: 3e1b0ca16339aa448c350fe69a302eecc38b58c2a3d4466395f18f4a3e8dad68
+    manifestHash: 64438a85c43e9d5da4ef890d339ffe62b7afe5c993e0e3008eb2ed86d5e63624
    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_bucket_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_bucket_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@ -762,6 +762,7 @@ metadata:
    app.kubernetes.io/version: v1.4.0
    k8s-addon: aws-ebs-csi-driver.addons.k8s.io
  name: ebs-csi-controller
+  namespace: kube-system
 spec:
  maxUnavailable: 1
  selector:
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content
@ -61,7 +61,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: dd8a6632d53821b6fc49ad83d524cff280e3be3205f2d09aa6905af7cebe4af6
+    manifestHash: 6315a30ca03764776dcb972927ee124f6b22d64b0e681e67e82e4ac32075ee52
    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
@ -407,7 +407,7 @@ spec:
                - ebs-csi-controller
            topologyKey: kubernetes.com/hostname
          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100 
+          - weight: 100
            podAffinityTerm:
              labelSelector:
                matchExpressions:
@ -559,6 +559,7 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
  name: ebs-csi-controller
+  namespace: kube-system
  labels:
    app.kubernetes.io/name: aws-ebs-csi-driver
    app.kubernetes.io/instance: aws-ebs-csi-driver
@ -569,4 +570,4 @@ spec:
      app: ebs-csi-controller
      app.kubernetes.io/instance: aws-ebs-csi-driver
  maxUnavailable: 1
-{{ end }}
+{{ end }}
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@ -61,7 +61,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.17
    manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824
+    manifestHash: a0e50aa57e7960cdac1cabed70ef1c9305f02a52c3e8a19f04f552a72b4cbdae
    name: aws-ebs-csi-driver.addons.k8s.io
    selector:
      k8s-addon: aws-ebs-csi-driver.addons.k8s.io