From f0dcde23f6c0e050468df310fa5c67a55326a6f5 Mon Sep 17 00:00:00 2001
From: Thomas Runyon <thomas.runyon.2.ctr@us.af.mil>
Date: Fri, 22 Jan 2021 11:01:30 -0500
Subject: [PATCH] chore: fix merge
---
chart/Chart.yaml | 5 +----
chart/templates/gitlab-runner/namespace.yaml | 2 +-
chart/values.yaml | 9 ++-------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 04d6a14c53..bdabca5d4a 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,4 @@
apiVersion: v2
name: bigbang
-version: 1.0.3
-<<<<<<< HEAD
+version: 1.0.5
-=======
->>>>>>> origin/master
diff --git a/chart/templates/gitlab-runner/namespace.yaml b/chart/templates/gitlab-runner/namespace.yaml
index 7d28e45208..10fa602462 100644
--- a/chart/templates/gitlab-runner/namespace.yaml
+++ b/chart/templates/gitlab-runner/namespace.yaml
@@ -4,7 +4,7 @@ kind: Namespace
metadata:
name: gitlab-runner
-{{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}
+{{- if ( include "imagePullSecret" . ) }}
---
apiVersion: v1
kind: Secret
diff --git a/chart/values.yaml b/chart/values.yaml
index 928e3fbfc6..5f3d5ed483 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -167,10 +167,9 @@ addons:
git:
repo: https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice.git
path: "./chart"
-<<<<<<< HEAD
- tag: "0.1.4-bb.0"
+ tag: "0.1.6-bb.0"
values: {}
-
+
gitlabRunner:
enabled: false
git:
@@ -178,9 +177,6 @@ addons:
path: "./chart"
tag: "0.19.2-bb.1"
values: {}
-=======
- tag: "0.1.6-bb.0"
- values: {}
gitlab:
enabled: false
@@ -188,4 +184,3 @@ addons:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
path: "./chart"
tag: "4.2.0-bb.1"
->>>>>>> origin/master
--
GitLab