Merge pull request #34 from aaron-prindle/fix-gcr

Fixing issues with GCR

README.md

@@ -63,29 +63,15 @@ kubectl create -f k8s/secret.yaml
 
 1. Clone the repo and navigate to directory
 
-2. Input your application_default_credentials.json information into a secret with the template at k8s/gcr-secret.yaml:
-```bash
-apiVersion: v1
-data:
-  application_default_credentials.json: <base-64 encoded ~/.config/gcloud/application_default_credentials.json>
-kind: Secret
-metadata:
-  name: gcr-secret
-  namespace: kube-system
-  labels:
-    app: gcr-creds
-    version: v1.2
-    kubernetes.io/minikube-addons: gcr-creds
-type: Opaque
-```
+2. Input your application_default_credentials.json information into the secret.yaml template located [here](k8s/secret.yaml#L17):
 The value for application_default_credentials.json can be obtained with the following command:
 ```bash
 base64 -w $HOME/.config/gcloud/application_default_credentials.json
 ```
 
 3. Create the secret in kubernetes
 ```bash
-kubectl create -f k8s/gcr-secret.yaml
+kubectl create -f k8s/secret.yml
 ```
 
 3. Create the replication controller:

k8s/replicationController.yaml

@@ -41,3 +41,11 @@ spec:
               secretKeyRef:
                 name: registry-creds
                 key: aws-region
+        volumeMounts:
+        - name: gcr-creds
+          mountPath: "/root/.config/gcloud"
+          readOnly: true
+      volumes:
+      - name: gcr-creds
+        secret:
+          secretName: gcr-secret

k8s/secret.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: v1
 data:
   AWS_ACCESS_KEY_ID: Y2hhbmdlbWU=
@@ -13,3 +12,15 @@ metadata:
     version: v1.2
     kubernetes.io/minikube-addons: registry-creds
 type: Opaque
+
+data:
+  application_default_credentials.json: Y2hhbmdlbWU=
+kind: Secret
+metadata:
+  name: gcr-secret
+  namespace: kube-system
+  labels:
+    app: gcr-creds
+    version: v1.2
+    kubernetes.io/minikube-addons: gcr-creds
+type: Opaque

main.go

@@ -274,7 +274,7 @@ func validateParams() providerConfig {
 	var ecrEnabled bool
 
 	awsAccountID = os.Getenv("awsaccount")
-	if len(awsAccountID) == 0 {
+	if len(awsAccountID) == 0 || awsAccountID == "changeme" {
 		log.Print("Missing awsaccount env variable, assuming GCR usage")
 		gcrEnabled = true
 		ecrEnabled = false
@@ -326,5 +326,4 @@ func main() {
 			}
 		}
 	}
-
 }