fix: helm charts - default image pull policy; symlink crds in charts …

…directory to deploy
isindir · Jul 5, 2020 · 221e0a6 · 221e0a6
1 parent f6dac56
commit 221e0a6
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 275 deletions.
diff --git a/chart/crds b/chart/crds
@@ -0,0 +1 @@
+../deploy/crds
diff --git a/chart/crds/00init.yaml b/chart/crds/00init.yaml
diff --git a/chart/crds/01update.yaml b/chart/crds/01update.yaml
diff --git a/chart/crds/02add.yaml b/chart/crds/02add.yaml
diff --git a/chart/crds/03delete.yaml b/chart/crds/03delete.yaml
diff --git a/chart/crds/isindir_v1alpha1_sopssecret_cr.yaml b/chart/crds/isindir_v1alpha1_sopssecret_cr.yaml
diff --git a/chart/crds/isindir_v1alpha1_sopssecret_crd.yaml b/chart/crds/isindir_v1alpha1_sopssecret_crd.yaml
diff --git a/chart/crds/jenkins-ns.yaml b/chart/crds/jenkins-ns.yaml
diff --git a/chart/helm2/sops-secrets-operator/Chart.yaml b/chart/helm2/sops-secrets-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.1.9
+version: 0.1.10
 appVersion: 0.0.10
 description: sops secrets operator
 name: sops-secrets-operator

diff --git a/chart/helm2/sops-secrets-operator/README.md b/chart/helm2/sops-secrets-operator/README.md
@@ -76,7 +76,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
 | `replicaCount` | Deployment replica count  - should not be modified | `1` |
 | `image.repository` | Operator image | `"isindir/sops-secrets-operator"` |
 | `image.tag` | Operator image tag | `"0.0.10"` |
-| `image.pullPolicy` | Operator image pull policy | `"AlwaysPull"` |
+| `image.pullPolicy` | Operator image pull policy | `"Always"` |
 | `imagePullSecrets` | Secrets to pull image from private docker repository | `[]` |
 | `nameOverride` | Overrides auto-generated short resource name | `""` |
 | `fullnameOverride` | Overrides auto-generated long resource name | `""` |

diff --git a/chart/helm2/sops-secrets-operator/values.yaml b/chart/helm2/sops-secrets-operator/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1  # Deployment replica count  - should not be modified
 image:
   repository: isindir/sops-secrets-operator  # Operator image
   tag: 0.0.10  # Operator image tag
-  pullPolicy: AlwaysPull  # Operator image pull policy
+  pullPolicy: Always  # Operator image pull policy
 
 imagePullSecrets: []  # Secrets to pull image from private docker repository
 nameOverride: ""  # Overrides auto-generated short resource name

diff --git a/chart/helm3/sops-secrets-operator/Chart.yaml b/chart/helm3/sops-secrets-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 0.1.0
+version: 0.2.1
 appVersion: 0.0.10
 type: application
 description: sops secrets operator

diff --git a/chart/helm3/sops-secrets-operator/README.md b/chart/helm3/sops-secrets-operator/README.md
@@ -76,7 +76,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
 | `replicaCount` | Deployment replica count  - should not be modified | `1` |
 | `image.repository` | Operator image | `"isindir/sops-secrets-operator"` |
 | `image.tag` | Operator image tag | `"0.0.10"` |
-| `image.pullPolicy` | Operator image pull policy | `"AlwaysPull"` |
+| `image.pullPolicy` | Operator image pull policy | `"Always"` |
 | `imagePullSecrets` | Secrets to pull image from private docker repository | `[]` |
 | `nameOverride` | Overrides auto-generated short resource name | `""` |
 | `fullnameOverride` | Overrides auto-generated long resource name | `""` |

diff --git a/chart/helm3/sops-secrets-operator/values.yaml b/chart/helm3/sops-secrets-operator/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1  # Deployment replica count  - should not be modified
 image:
   repository: isindir/sops-secrets-operator  # Operator image
   tag: 0.0.10  # Operator image tag
-  pullPolicy: AlwaysPull  # Operator image pull policy
+  pullPolicy: Always  # Operator image pull policy
 
 imagePullSecrets: []  # Secrets to pull image from private docker repository
 nameOverride: ""  # Overrides auto-generated short resource name

diff --git a/pkg/controller/sopssecret/sopssecret_controller.go b/pkg/controller/sopssecret/sopssecret_controller.go
@@ -157,7 +157,7 @@ func (r *ReconcileSopsSecret) Reconcile(request reconcile.Request) (reconcile.Re
 		}
 
 		if !metav1.IsControlledBy(foundSecret, instance) {
-			return reconcile.Result{}, fmt.Errorf("Secret isn't currently owned by sops-secrets-operator")
+			return reconcile.Result{}, fmt.Errorf("secret isn't currently owned by sops-secrets-operator")
 		}
 
 		origSecret := foundSecret