diff --git a/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml b/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml index 8d4dc00d9..09e7ce18e 100644 --- a/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml +++ b/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml @@ -1045,7 +1045,12 @@ data: kind: ServiceAccount metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-controller-sa namespace: kube-system --- @@ -1054,7 +1059,12 @@ data: kind: ServiceAccount metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-node-sa namespace: kube-system --- @@ -1067,6 +1077,13 @@ data: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-leases-role namespace: kube-system rules: @@ -1104,7 +1121,12 @@ data: kind: ClusterRole metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-node-role rules: - apiGroups: @@ -1119,13 +1141,20 @@ data: resources: - volumeattachments verbs: + - get - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-external-attacher-role rules: - apiGroups: @@ -1175,7 +1204,12 @@ data: kind: ClusterRole metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-external-provisioner-role rules: - apiGroups: @@ -1258,7 +1292,12 @@ data: kind: ClusterRole metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-external-resizer-role rules: - apiGroups: @@ -1317,7 +1356,12 @@ data: kind: ClusterRole metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-external-snapshotter-role rules: - apiGroups: @@ -1437,7 +1481,12 @@ data: kind: RoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-leases-rolebinding namespace: kube-system roleRef: @@ -1461,12 +1510,18 @@ data: subjects: - kind: ServiceAccount name: snapshot-controller + namespace: kube-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-attacher-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -1481,7 +1536,12 @@ data: kind: ClusterRoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-node-getter-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -1496,7 +1556,12 @@ data: kind: ClusterRoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-provisioner-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -1511,7 +1576,12 @@ data: kind: ClusterRoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-resizer-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -1526,7 +1596,12 @@ data: kind: ClusterRoleBinding metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-snapshotter-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -1554,14 +1629,21 @@ data: kind: Deployment metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-controller namespace: kube-system spec: replicas: 2 + revisionHistoryLimit: 10 selector: matchLabels: app: ebs-csi-controller + app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver strategy: rollingUpdate: @@ -1571,7 +1653,12 @@ data: metadata: labels: app: ebs-csi-controller + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 spec: affinity: nodeAffinity: @@ -1601,10 +1688,11 @@ data: weight: 100 containers: - args: + - controller - --endpoint=$(CSI_ENDPOINT) - --batching=true - --logging-format=text - - --user-agent-extra=kustomize + - --user-agent-extra=helm - --v=2 env: - name: CSI_ENDPOINT @@ -1631,7 +1719,7 @@ data: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.25.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.28.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1680,7 +1768,7 @@ data: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.6.2-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v4.0.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: csi-provisioner resources: @@ -1706,7 +1794,7 @@ data: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.4.2-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.5.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: csi-attacher resources: @@ -1731,7 +1819,7 @@ data: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v6.3.2-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v7.0.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: csi-snapshotter resources: @@ -1758,7 +1846,7 @@ data: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.9.2-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.10.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: csi-resizer resources: @@ -1775,7 +1863,7 @@ data: name: socket-dir - args: - --csi-address=/csi/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.12.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: liveness-probe resources: @@ -1847,10 +1935,9 @@ data: - args: - --v=5 - --leader-election=true - image: registry.k8s.io/sig-storage/snapshot-controller:v6.3.0 + image: registry.k8s.io/sig-storage/snapshot-controller:v6.3.3 imagePullPolicy: IfNotPresent name: snapshot-controller - nodeSelector: {} priorityClassName: system-cluster-critical serviceAccountName: snapshot-controller tolerations: @@ -1870,7 +1957,12 @@ data: kind: PodDisruptionBudget metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-controller namespace: kube-system spec: @@ -1878,25 +1970,38 @@ data: selector: matchLabels: app: ebs-csi-controller + app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver --- apiVersion: apps/v1 kind: DaemonSet metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs-csi-node namespace: kube-system spec: + revisionHistoryLimit: 10 selector: matchLabels: app: ebs-csi-node + app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver template: metadata: labels: app: ebs-csi-node + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 spec: affinity: nodeAffinity: @@ -1928,7 +2033,7 @@ data: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.25.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.28.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -1975,7 +2080,7 @@ data: value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.9.1-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.10.0-eks-1-29-5 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2005,7 +2110,7 @@ data: name: probe-dir - args: - --csi-address=/csi/csi.sock - image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-9 + image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.12.0-eks-1-29-5 imagePullPolicy: IfNotPresent name: liveness-probe resources: @@ -2031,12 +2136,7 @@ data: runAsUser: 0 serviceAccountName: ebs-csi-node-sa tolerations: - - key: CriticalAddonsOnly - operator: Exists - - effect: NoExecute - operator: Exists - - effect: NoSchedule - operator: Exists + - operator: Exists volumes: - hostPath: path: /var/lib/kubelet @@ -2065,7 +2165,12 @@ data: kind: CSIDriver metadata: labels: + app.kubernetes.io/component: csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/version: 1.28.0 + helm.sh/chart: aws-ebs-csi-driver-2.28.1 name: ebs.csi.aws.com spec: attachRequired: true diff --git a/hack/addons/kustomize/aws-cpi/kustomization.yaml.tmpl b/hack/addons/kustomize/aws-cpi/kustomization.yaml.tmpl index 5b103b69c..3aff2a7e1 100644 --- a/hack/addons/kustomize/aws-cpi/kustomization.yaml.tmpl +++ b/hack/addons/kustomize/aws-cpi/kustomization.yaml.tmpl @@ -9,10 +9,11 @@ metadata: helmCharts: - name: aws-cloud-controller-manager - includeCRDs: true + repo: https://kubernetes.github.io/cloud-provider-aws releaseName: aws-cloud-controller-manager version: ${AWS_CPI_CHART_VERSION} - repo: https://kubernetes.github.io/cloud-provider-aws + includeCRDs: true + skipTests: true patches: - patch: |- diff --git a/hack/addons/kustomize/aws-ebs-csi/helm-values.yaml b/hack/addons/kustomize/aws-ebs-csi/helm-values.yaml new file mode 100644 index 000000000..d1cf5632d --- /dev/null +++ b/hack/addons/kustomize/aws-ebs-csi/helm-values.yaml @@ -0,0 +1,36 @@ +# Copyright 2024 D2iQ, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +--- +controller: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/control-plane + operator: Exists + tolerations: + - key: CriticalAddonsOnly + operator: Exists + - effect: NoExecute + operator: Exists + tolerationSeconds: 300 + - effect: NoSchedule + key: node-role.kubernetes.io/master + operator: Exists + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane + operator: Exists +node: + priorityClassName: system-node-critical +sidecars: + snapshotter: + forceEnable: true +storageClasses: +- metadata: + name: ebs-sc + volumeBindingMode: WaitForFirstConsumer + parameters: + csi.storage.k8s.io/fstype: ext4 + type: gp3 diff --git a/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl b/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl index be1fb9514..8746fc05d 100644 --- a/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl +++ b/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl @@ -7,37 +7,16 @@ kind: Kustomization metadata: name: aws-ebs-csi-kustomize -resources: -- github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=${AWS_EBS_CSI_VERSION} -- storage-class.yaml -- github.com/kubernetes-csi/external-snapshotter/client/config/crd/?ref=${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} -- github.com/kubernetes-csi/external-snapshotter/deploy/kubernetes/snapshot-controller/?ref=${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} +namespace: kube-system -patches: -- path: ./overlays/controller-nodeAffinity.yaml - target: - kind: Deployment - name: ebs-csi-controller - namespace: kube-system -- path: ./overlays/controller-nodeAffinity.yaml - target: - kind: Deployment - name: snapshot-controller - namespace: kube-system -- path: ./overlays/deployment-priorityClassName.yaml - target: - kind: Deployment - name: snapshot-controller - namespace: kube-system -- path: ./overlays/ds-tolerations.yaml - target: - kind: DaemonSet - name: ebs-csi-node - namespace: kube-system +helmCharts: +- name: aws-ebs-csi-driver + repo: https://kubernetes-sigs.github.io/aws-ebs-csi-driver + releaseName: aws-ebs-csi-driver + version: ${AWS_EBS_CSI_CHART_VERSION} + valuesFile: helm-values.yaml + includeCRDs: true + skipTests: true -# always override the images to match the version from the set envs -images: -- name: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver - newTag: ${AWS_EBS_CSI_VERSION} -- name: registry.k8s.io/sig-storage/snapshot-controller - newTag: ${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} +resources: +- ../external-snapshotter diff --git a/hack/addons/kustomize/aws-ebs-csi/overlays/controller-priorityClassName.yaml b/hack/addons/kustomize/aws-ebs-csi/overlays/controller-priorityClassName.yaml deleted file mode 100644 index 5ed2a9a6f..000000000 --- a/hack/addons/kustomize/aws-ebs-csi/overlays/controller-priorityClassName.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: NA -spec: - template: - spec: - priorityClassName: system-cluster-critical diff --git a/hack/addons/kustomize/aws-ebs-csi/overlays/ds-priorityClassName.yaml b/hack/addons/kustomize/aws-ebs-csi/overlays/ds-priorityClassName.yaml deleted file mode 100644 index e8178516b..000000000 --- a/hack/addons/kustomize/aws-ebs-csi/overlays/ds-priorityClassName.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: NA -spec: - template: - spec: - priorityClassName: system-node-critical diff --git a/hack/addons/kustomize/aws-ebs-csi/overlays/ds-tolerations.yaml b/hack/addons/kustomize/aws-ebs-csi/overlays/ds-tolerations.yaml deleted file mode 100644 index b1ef13447..000000000 --- a/hack/addons/kustomize/aws-ebs-csi/overlays/ds-tolerations.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: NA -spec: - template: - spec: - tolerations: - - key: CriticalAddonsOnly - operator: Exists - - effect: NoExecute - operator: Exists - - effect: NoSchedule - operator: Exists diff --git a/hack/addons/kustomize/cilium/kustomization.yaml.tmpl b/hack/addons/kustomize/cilium/kustomization.yaml.tmpl index f5a5215ec..aa60d883e 100644 --- a/hack/addons/kustomize/cilium/kustomization.yaml.tmpl +++ b/hack/addons/kustomize/cilium/kustomization.yaml.tmpl @@ -12,10 +12,11 @@ sortOptions: helmCharts: - name: cilium - includeCRDs: true - valuesFile: helm-values.yaml + repo: https://helm.cilium.io/ releaseName: cilium version: ${CILIUM_VERSION} - repo: https://helm.cilium.io/ + valuesFile: helm-values.yaml + includeCRDs: true + skipTests: true namespace: kube-system diff --git a/hack/addons/kustomize/external-snapshotter/kustomization.yaml.tmpl b/hack/addons/kustomize/external-snapshotter/kustomization.yaml.tmpl new file mode 100644 index 000000000..8ddba21b2 --- /dev/null +++ b/hack/addons/kustomize/external-snapshotter/kustomization.yaml.tmpl @@ -0,0 +1,31 @@ +# Copyright 2023 D2iQ, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +metadata: + name: external-snapshotter-kustomize + +namespace: kube-system + +resources: +- github.com/kubernetes-csi/external-snapshotter/client/config/crd/?ref=${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} +- github.com/kubernetes-csi/external-snapshotter/deploy/kubernetes/snapshot-controller/?ref=${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} + +patches: +- path: ./overlays/deployment-nodeAffinity.yaml + target: + kind: Deployment + name: snapshot-controller + namespace: kube-system +- path: ./overlays/deployment-priorityClassName.yaml + target: + kind: Deployment + name: snapshot-controller + namespace: kube-system + +# always override the images to match the version from the set envs +images: +- name: registry.k8s.io/sig-storage/snapshot-controller + newTag: ${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION} diff --git a/hack/addons/kustomize/aws-ebs-csi/overlays/controller-nodeAffinity.yaml b/hack/addons/kustomize/external-snapshotter/overlays/deployment-nodeAffinity.yaml similarity index 87% rename from hack/addons/kustomize/aws-ebs-csi/overlays/controller-nodeAffinity.yaml rename to hack/addons/kustomize/external-snapshotter/overlays/deployment-nodeAffinity.yaml index 309dd7551..bd5c519a0 100644 --- a/hack/addons/kustomize/aws-ebs-csi/overlays/controller-nodeAffinity.yaml +++ b/hack/addons/kustomize/external-snapshotter/overlays/deployment-nodeAffinity.yaml @@ -15,9 +15,6 @@ spec: - matchExpressions: - key: node-role.kubernetes.io/control-plane operator: Exists - nodeSelector: - node-role.kubernetes.io/control-plane: null - node-role.kubernetes.io/master: null tolerations: - key: CriticalAddonsOnly operator: Exists diff --git a/hack/addons/kustomize/aws-ebs-csi/overlays/deployment-priorityClassName.yaml b/hack/addons/kustomize/external-snapshotter/overlays/deployment-priorityClassName.yaml similarity index 100% rename from hack/addons/kustomize/aws-ebs-csi/overlays/deployment-priorityClassName.yaml rename to hack/addons/kustomize/external-snapshotter/overlays/deployment-priorityClassName.yaml diff --git a/hack/addons/kustomize/nfd/kustomization.yaml.tmpl b/hack/addons/kustomize/nfd/kustomization.yaml.tmpl index 3023e5a18..9b276c270 100644 --- a/hack/addons/kustomize/nfd/kustomization.yaml.tmpl +++ b/hack/addons/kustomize/nfd/kustomization.yaml.tmpl @@ -12,13 +12,14 @@ resources: helmCharts: - name: node-feature-discovery - includeCRDs: true + repo: https://kubernetes-sigs.github.io/node-feature-discovery/charts + releaseName: node-feature-discovery + version: ${NODE_FEATURE_DISCOVERY_VERSION} valuesFile: helm-values.yaml valuesInline: image: tag: "v${NODE_FEATURE_DISCOVERY_VERSION}-minimal" - releaseName: node-feature-discovery - version: ${NODE_FEATURE_DISCOVERY_VERSION} - repo: https://kubernetes-sigs.github.io/node-feature-discovery/charts + includeCRDs: true + skipTests: true namespace: node-feature-discovery diff --git a/hack/addons/kustomize/tigera-operator/kustomization.yaml.tmpl b/hack/addons/kustomize/tigera-operator/kustomization.yaml.tmpl index 37005ef30..a6540a013 100644 --- a/hack/addons/kustomize/tigera-operator/kustomization.yaml.tmpl +++ b/hack/addons/kustomize/tigera-operator/kustomization.yaml.tmpl @@ -15,10 +15,11 @@ resources: helmCharts: - name: tigera-operator - includeCRDs: true - valuesFile: helm-values.yaml + repo: https://docs.tigera.io/calico/charts releaseName: tigera-operator version: ${CALICO_VERSION} - repo: https://docs.tigera.io/calico/charts + valuesFile: helm-values.yaml + includeCRDs: true + skipTests: true namespace: tigera-operator diff --git a/hack/addons/update-aws-ebs-csi.sh b/hack/addons/update-aws-ebs-csi.sh index cb081f1c2..44824043c 100755 --- a/hack/addons/update-aws-ebs-csi.sh +++ b/hack/addons/update-aws-ebs-csi.sh @@ -8,8 +8,12 @@ readonly SCRIPT_DIR # shellcheck source=hack/common.sh source "${SCRIPT_DIR}/../common.sh" -if [ -z "${AWS_EBS_CSI_VERSION:-}" ]; then - echo "Missing environment variable: AWS_EBS_CSI_VERSION" +if [ -z "${AWS_EBS_CSI_CHART_VERSION:-}" ]; then + echo "Missing environment variable: AWS_EBS_CSI_CHART_VERSION" + exit 1 +fi +if [ -z "${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION:-}" ]; then + echo "Missing environment variable: AWS_CSI_SNAPSHOT_CONTROLLER_VERSION" exit 1 fi @@ -19,11 +23,17 @@ trap_add "rm -rf ${ASSETS_DIR}" EXIT readonly FILE_NAME="aws-ebs-csi.yaml" -readonly KUSTOMIZE_BASE_DIR="${SCRIPT_DIR}/kustomize/aws-ebs-csi/" -envsubst -no-unset <"${KUSTOMIZE_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_DIR}/kustomization.yaml" -cp "${KUSTOMIZE_BASE_DIR}"/*.yaml "${ASSETS_DIR}" -cp -r "${KUSTOMIZE_BASE_DIR}"/overlays "${ASSETS_DIR}" -kustomize build --enable-helm "${ASSETS_DIR}" >"${ASSETS_DIR}/${FILE_NAME}" +readonly KUSTOMIZE_BASE_DIR="${SCRIPT_DIR}/kustomize/aws-ebs-csi" +mkdir -p "${ASSETS_DIR}/aws-ebs-csi" +envsubst -no-unset <"${KUSTOMIZE_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_DIR}/aws-ebs-csi/kustomization.yaml" +cp -r "${KUSTOMIZE_BASE_DIR}"/*.yaml "${ASSETS_DIR}/aws-ebs-csi/" + +readonly EXTERNAL_SNAPSHOTTER_BASE_DIR="${SCRIPT_DIR}/kustomize/external-snapshotter" +mkdir -p "${ASSETS_DIR}/external-snapshotter" +envsubst -no-unset <"${EXTERNAL_SNAPSHOTTER_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_DIR}/external-snapshotter/kustomization.yaml" +cp -r "${EXTERNAL_SNAPSHOTTER_BASE_DIR}/overlays" "${ASSETS_DIR}/external-snapshotter/" + +kustomize build --enable-helm "${ASSETS_DIR}/aws-ebs-csi/" >"${ASSETS_DIR}/${FILE_NAME}" kubectl create configmap aws-ebs-csi --dry-run=client --output yaml \ --from-file "${ASSETS_DIR}/${FILE_NAME}" \ diff --git a/make/addons.mk b/make/addons.mk index 17984be46..3065d640d 100644 --- a/make/addons.mk +++ b/make/addons.mk @@ -4,8 +4,8 @@ export CALICO_VERSION := $(shell goprintconst -file pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go -name defaultCalicoHelmChartVersion) export CILIUM_VERSION := $(shell goprintconst -file pkg/handlers/generic/lifecycle/cni/cilium/strategy_helmaddon.go -name defaultCiliumHelmChartVersion) export NODE_FEATURE_DISCOVERY_VERSION := $(shell goprintconst -file pkg/handlers/generic/lifecycle/nfd/strategy_helmaddon.go -name defaultHelmChartVersion) -export AWS_CSI_SNAPSHOT_CONTROLLER_VERSION := v6.3.0 -export AWS_EBS_CSI_VERSION := v1.25.0 +export AWS_CSI_SNAPSHOT_CONTROLLER_VERSION := v6.3.3 +export AWS_EBS_CSI_CHART_VERSION := v2.28.1 # a map of AWS CPI versions export AWS_CPI_VERSION_127 := v1.27.1 export AWS_CPI_CHART_VERSION_127 := 0.0.8