Update gitignore, filenames, CF userdata

devops/aws/README.md

@@ -26,7 +26,7 @@ On Mac run the command:
 Follow [the official installation guide](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) for your system.
 
 # How to run
-Copy and edit the file `deploy-config.sample.cfg` and update parameters like AWS_KEY_PAIR_NAME, KEY_PATH
+Copy and edit the file `deploy-infra.sample.cfg` and update parameters like AWS_KEY_PAIR_NAME, KEY_PATH
 Run the `deploy-infra.sh` script to deploy the infrastructure
 
 ```
@@ -38,4 +38,4 @@ cd devops/aws
 
 ```
 ./destroy-infra.sh your-deploy-config.cfg
-```
+```

devops/aws/cloudformation/infrastructure.yml

@@ -122,11 +122,10 @@ Resources:
             # Update all packages
             apt-get update -y
 
-            # Prevent interactive prompts that would interrup the installation
+            # Prevent interactive prompts that would interrupt the installation
             export DEBIAN_FRONTEND=noninteractive
 
-            # Install the updates except docker, to avoid interactive prompt which blocks the flow of the script
-            apt-mark hold docker.io
+            # Install the updates
             apt-get upgrade -y
 
             # Get latest cfn scripts and install them;

devops/aws/cloudformation/single-instance-docker.yml

@@ -61,7 +61,7 @@ Resources:
             # Update all packages
             apt-get update -y
 
-            # Prevent interactive prompts that would interrup the installation
+            # Prevent interactive prompts that would interrupt the installation
             export DEBIAN_FRONTEND=noninteractive
 
             # Install the updates

devops/aws/cloudformation/single-instance.yml

@@ -59,7 +59,7 @@ Resources:
             # Update all packages
             apt-get update -y
 
-            # Prevent interactive prompts that would interrup the installation
+            # Prevent interactive prompts that would interrupt the installation
             export DEBIAN_FRONTEND=noninteractive
 
             # Install the updates

devops/kubernetes/node-network/.gitignore

@@ -1,6 +1,6 @@
 /bin/
 /node_modules/
-kubeconfig.yml
+kubeconfig*
 package-lock.json
 .env
 Pulumi.*.yaml

devops/kubernetes/query-node/.gitignore

@@ -1,6 +1,6 @@
 /bin/
 /node_modules/
-kubeconfig.yml
+kubeconfig*
 package-lock.json
 .env
 Pulumi.*.yaml

devops/kubernetes/query-node/kubeconfig

@@ -1,31 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeE1UQXlNakV6TkRreU9Wb1hEVE14TVRBeU1ERXpORGt5T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSjJvCm0xcmpMaEs5eEN1WVRqRjhBNnBNVDVxaTI0S21aUGVJZ0RjUWZmaFZaQU5vZGlFdmFNSVgwUE40Qzl5bGZVQ3YKRmc2amFsTlRLZ3IyV01Wd1JHVmV4aE5mTEdkdE81L21ZRVp1T0U0S3RwYmdFUjMyeEdDdUNuUFhHcUt1YUY3YQpST2Mvc1VMU0V6TVNHMUlwYUdDUlIweERja0JPVTdLWGg3eVBjL2xPNXpWTWdZWEVTUVVzeFUzajQ3WWRGZWVXCm9mTmhXcUN0cnkvMkJtVWhPWnB4YXBrUkRLa1QrZXpLV0tkbFl6ZVZKS3UvNWJnODgvb0sra1EvMjVkUmFadzYKdjJBN3MrZ09Xa2FPQ1NqR2NmNThTWWlBcTArR1dvUFI4dE1IOFNqSWdyZWVScjJFbU1tMWhFbDJZS3VTYkRDQwpIYkJza0NBMFh1T1l6eUZWMzA4Q0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZFK0pLY1FNYXAwbVBMS004d3AxZitjN3QxUjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBTFdQS2FScG5oVkZlRUg0NnpOb1ZhM3FMRkttbm50VUxjVnlROXNxT09DMzluWmlqdwo1aEwrRGRsSWJIK2dHU3hZY2RkWWx0Qm9UdDEyTG10OG84YWxETU5IWlEwTUdGNEx3bENjRDBUa3pTaFk0KzJnCmhKWGpKTnF6WTQxWTh4YzhVbThXY3poVWtTVVNaRDhia3hDd1htMjRYUW4rQktvNVh1Zm5SRTRYYVk2Y21zL1cKY2VjMzNGdDFwLzMzMjZDb3IwQjVpeC9iQmZuOGxRS2I4eU4zRm5yODc2NWpVWTVWa1FqdjYrc0ZaSWtkdkhwUApqNzgzbHJYOEJRRW5oamZKVFBCcVNPYUlWQVZRRCtNVVQ4OUppQTVNVzdaVVhwNVcrSnFyM2k2dkZwb2FXbG9uCk1kNVhFMFI0b0YvalFkcG16Y2xyMElTbmpjclBkQklQQ3kyQQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-    server: https://450F306AE798F0057C49C428A8BE608A.gr7.us-east-1.eks.amazonaws.com
-  name: kubernetes
-contexts:
-- context:
-    cluster: kubernetes
-    namespace: query-node-ifgoohih
-    user: aws
-  name: aws
-current-context: aws
-kind: Config
-preferences: {}
-users:
-- name: aws
-  user:
-    exec:
-      apiVersion: client.authentication.k8s.io/v1alpha1
-      args:
-      - eks
-      - get-token
-      - --cluster-name
-      - eksctl-query-node-eksCluster-7e1b8b4
-      command: aws
-      env:
-      - name: AWS_PROFILE
-        value: joystream-user
-      interactiveMode: IfAvailable
-      provideClusterInfo: false

devops/kubernetes/storage-node/.gitignore

@@ -1,5 +1,5 @@
 /bin/
 /node_modules/
-kubeconfig.yml
+kubeconfig*
 package-lock.json
 Pulumi.*.yaml