Merge f7e7f65 into a830ab6

linode · Aug 23, 2019 · 48e4b70 · 48e4b70
2 parents a830ab6 + f7e7f65
commit 48e4b70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ sessionAffinityConfig:
 
 ## Generating a Manifest for Deployment
 
-Use the script located at `./hack/deploy/generate-manifest.sh` to generate a self-contained deployment manifest for the Linode CCM. Two arguments are required.
+Use the script located at `./deploy/generate-manifest.sh` to generate a self-contained deployment manifest for the Linode CCM. Two arguments are required.
 
 The first argument must be a Linode APIv4 Personal Access Token with all permissions.
 (https://cloud.linode.com/profile/tokens)
@@ -132,7 +132,7 @@ The second argument must be a Linode region.
 Example:
 
 ```sh
-./generate-manifest.sh $LINODE_API_TOKEN us-east
+./deploy/generate-manifest.sh $LINODE_API_TOKEN us-east
 ```
 
 This will create a file `ccm-linode.yaml` which you can use to deploy the CCM.

diff --git a/deploy/generate-manifest.sh b/deploy/generate-manifest.sh
@@ -16,6 +16,6 @@ $ ./generate-manifest.sh \$LINODE_API_TOKEN us-east"
 ENCODED_TOKEN=$(echo -n $1 | base64)
 ENCODED_REGION=$(echo -n $2 | base64)
 
-cat ccm-linode-template.yaml |
+cat "$(dirname "$0")/ccm-linode-template.yaml" |
 sed -e "s|{{ .Values.apiTokenB64 }}|$ENCODED_TOKEN|" |
 sed -e "s|{{ .Values.linodeRegionB64 }}|$ENCODED_REGION|" > ccm-linode.yaml