commiting merge

2018-03-31 14:25:55 +01:00 · 2018-03-31 14:25:55 +01:00 · 63a9c5d608
parent a060b90c65
commit 63a9c5d608
4 changed files with 0 additions and 16 deletions
--- a/chart/keel/values.yaml
+++ b/chart/keel/values.yaml
@ -4,11 +4,7 @@

 image:
  repository: keelhq/keel
-<<<<<<< HEAD
  tag: 0.8.3
-=======
-  tag: 0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
  pullPolicy: IfNotPresent

 # Enable insecure registries
--- a/deployment/deployment-norbac.yaml
+++ b/deployment/deployment-norbac.yaml
@ -30,11 +30,7 @@ spec:
    spec:
      serviceAccountName: keel
      containers:
-<<<<<<< HEAD
        - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
          imagePullPolicy: Always
          env:
            # - name: POLL
--- a/deployment/deployment-rbac.yaml
+++ b/deployment/deployment-rbac.yaml
@ -86,11 +86,7 @@ spec:
    spec:
      serviceAccountName: keel
      containers:
-<<<<<<< HEAD
        - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
          imagePullPolicy: Always
          env:
            # - name: POLL
--- a/hack/deployment.sample.yml
+++ b/hack/deployment.sample.yml
@ -16,11 +16,7 @@ spec:
    spec:
      serviceAccountName: keel
      containers:
-<<<<<<< HEAD
        - image: keelhq/keel:0.8.3
-=======
-        - image: keelhq/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
          imagePullPolicy: Always
          env:
            # - name: POLL