Resolve merge conflicts

stakater · May 20, 2021 · f8ce6fb · f8ce6fb
2 parents 8ffeef4 + ea50bd4
commit f8ce6fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/jira-service-desk-operator/Chart.yaml b/charts/jira-service-desk-operator/Chart.yaml
@@ -8,10 +8,10 @@ sources:
   - https://github.com/stakater/jira-service-desk-operator
 
 # Helm chart Version
-version:  0.0.42
+version:  0.0.43
 
 # Application version to be deployed
-appVersion:  0.0.42
+appVersion:  0.0.43
 
 keywords:
   - stakater

diff --git a/charts/jira-service-desk-operator/values.yaml b/charts/jira-service-desk-operator/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: stakater/jira-service-desk-operator
-  tag:  v0.0.42
+  tag:  v0.0.43
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: stakater/jira-service-desk-operator
-  newTag: v0.0.1
+  newTag: v0.0.43