diff --git a/hack/release-yaml.sh b/hack/release-yaml.sh index e64b527c..895f2a3c 100755 --- a/hack/release-yaml.sh +++ b/hack/release-yaml.sh @@ -21,11 +21,11 @@ last="$(ls -dq "${manifests}"* | tail -n 1)" # Build release manifest for manifest in "${manifests}"*; do echo "# ${manifest}" - cat "${manifest}" | sed -e "s|{{ .Values.image.tag }}|"${TAG}"|" + echo "$(cat ${manifest})" | sed -e "s|{{ .Values.image.tag }}|"${TAG}"|" # Don't add the separator if it's the last manifest if [[ "${manifest}" != "${last}" ]]; then - echo -e "\n---" + echo -e "---" fi done > "${RELEASES}/${TAGGED_RELEASE}" diff --git a/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver-v0.1.4.yaml b/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver-v0.1.4.yaml index 18d0c302..f483c030 100644 --- a/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver-v0.1.4.yaml +++ b/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver-v0.1.4.yaml @@ -55,7 +55,6 @@ spec: to use for any in-tree plugins replaced by this driver. pattern: in-tree|csi type: string - --- # pkg/linode-bs/deploy/kubernetes/02-csi-driver.yaml # Requires CSIDriverRegistry feature gate (alpha in 1.12) @@ -88,7 +87,6 @@ spec: description: Indicates this CSI volume driver requires additional pod information (like podName, podUID, etc.) during mount operations. type: string - --- # pkg/linode-bs/deploy/kubernetes/03-accounts-roles-bindings.yaml ##### Node Service Account, Roles, RoleBindings @@ -251,7 +249,6 @@ roleRef: kind: ClusterRole name: external-snapshotter-role apiGroup: rbac.authorization.k8s.io - --- # pkg/linode-bs/deploy/kubernetes/04-csi-driver-instance.yaml apiVersion: csi.storage.k8s.io/v1alpha1 @@ -261,7 +258,6 @@ metadata: spec: attachRequired: true podInfoOnMountVersion: "v1" - --- # pkg/linode-bs/deploy/kubernetes/05-csi-storageclass.yaml kind: StorageClass @@ -280,7 +276,6 @@ metadata: namespace: kube-system provisioner: linodebs.csi.linode.com reclaimPolicy: Retain - --- # pkg/linode-bs/deploy/kubernetes/06-ss-csi-linode-controller.yaml kind: StatefulSet @@ -386,7 +381,6 @@ spec: name: get-linode-id # octal mode 755 defaultMode: 493 - --- # pkg/linode-bs/deploy/kubernetes/07-ds-csi-linode-node.yaml kind: DaemonSet @@ -530,7 +524,6 @@ spec: hostPath: path: /sys type: Directory - --- # pkg/linode-bs/deploy/kubernetes/08-cm-get-linode-id.yaml apiVersion: v1 diff --git a/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver.yaml b/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver.yaml index 18d0c302..f483c030 100644 --- a/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver.yaml +++ b/pkg/linode-bs/deploy/releases/linode-blockstorage-csi-driver.yaml @@ -55,7 +55,6 @@ spec: to use for any in-tree plugins replaced by this driver. pattern: in-tree|csi type: string - --- # pkg/linode-bs/deploy/kubernetes/02-csi-driver.yaml # Requires CSIDriverRegistry feature gate (alpha in 1.12) @@ -88,7 +87,6 @@ spec: description: Indicates this CSI volume driver requires additional pod information (like podName, podUID, etc.) during mount operations. type: string - --- # pkg/linode-bs/deploy/kubernetes/03-accounts-roles-bindings.yaml ##### Node Service Account, Roles, RoleBindings @@ -251,7 +249,6 @@ roleRef: kind: ClusterRole name: external-snapshotter-role apiGroup: rbac.authorization.k8s.io - --- # pkg/linode-bs/deploy/kubernetes/04-csi-driver-instance.yaml apiVersion: csi.storage.k8s.io/v1alpha1 @@ -261,7 +258,6 @@ metadata: spec: attachRequired: true podInfoOnMountVersion: "v1" - --- # pkg/linode-bs/deploy/kubernetes/05-csi-storageclass.yaml kind: StorageClass @@ -280,7 +276,6 @@ metadata: namespace: kube-system provisioner: linodebs.csi.linode.com reclaimPolicy: Retain - --- # pkg/linode-bs/deploy/kubernetes/06-ss-csi-linode-controller.yaml kind: StatefulSet @@ -386,7 +381,6 @@ spec: name: get-linode-id # octal mode 755 defaultMode: 493 - --- # pkg/linode-bs/deploy/kubernetes/07-ds-csi-linode-node.yaml kind: DaemonSet @@ -530,7 +524,6 @@ spec: hostPath: path: /sys type: Directory - --- # pkg/linode-bs/deploy/kubernetes/08-cm-get-linode-id.yaml apiVersion: v1