From 98e31cb3b26a37b69486ed0d753b4cf8103df75a Mon Sep 17 00:00:00 2001
From: jainish shah <jainishshah@yahoo.com>
Date: Sun, 4 Dec 2016 09:45:01 +0200
Subject: [PATCH] Changed default image to Artifactory-oss image

---
 incubator/artifactory/README.md                 | 8 +++++++-
 incubator/artifactory/templates/deployment.yaml | 2 +-
 incubator/artifactory/values.yaml               | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/incubator/artifactory/README.md b/incubator/artifactory/README.md
index 17ec2b8a88..f9996e9db0 100644
--- a/incubator/artifactory/README.md
+++ b/incubator/artifactory/README.md
@@ -12,6 +12,7 @@
 ## Chart Details
 This chart will do the following:
 
+* Deploy Artifactory-oss
 * Deploy Artifactory-Pro
 
 ## Installing the Chart
@@ -22,6 +23,11 @@ To install the chart with the release name `my-release`:
 $ helm install --name my-release incubator/artifactory
 ```
 
+Note: By default it will run Artifactory-oss to run Artifactory-Pro uncomment image in value.yaml or use following command
+```bash
+$ helm install --name my-release --set image=docker.bintray.io/jfrog/artifactory-pro incubator/artifactory
+```
+
 ## Deleting the Charts
 
 Deletion of the PetSet doesn't cascade to deleting associated Pods and PVCs. To delete them:
@@ -36,7 +42,7 @@ The following tables lists the configurable parameters of the artifactory chart
 
 |         Parameter         |           Description             |                         Default                          |
 |---------------------------|-----------------------------------|----------------------------------------------------------|
-| `Image`                   | Container image name              | `docker.bintray.io/jfrog/artifactory-pro`                |
+| `Image`                   | Container image name              | `docker.bintray.io/jfrog/artifactory-oss`                |
 | `ImageTag`                | Container image tag               | `4.14.1`                                                 |
 | `ImagePullPolicy`         | Container pull policy             | `Always`                                                 |
 
diff --git a/incubator/artifactory/templates/deployment.yaml b/incubator/artifactory/templates/deployment.yaml
index 225b84c03a..b1fbf3170c 100644
--- a/incubator/artifactory/templates/deployment.yaml
+++ b/incubator/artifactory/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
         # is a nice option for the user. Especially in the strange cases like
         # artifactory where the base distro is determined by the tag. Using :latest
         # is frowned upon, using :stable isn't that great either.
-        image: "{{default "docker.bintray.io/jfrog/artifactory-pro" .Values.image}}:{{default "4.14.1" .Values.imageTag}}"
+        image: "{{default "docker.bintray.io/jfrog/artifactory-oss" .Values.image}}:{{default "4.14.1" .Values.imageTag}}"
         imagePullPolicy: {{default "IfNotPresent" .Values.ImagePullPolicy}}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
diff --git a/incubator/artifactory/values.yaml b/incubator/artifactory/values.yaml
index 3ae9c2fccc..14de5a8431 100644
--- a/incubator/artifactory/values.yaml
+++ b/incubator/artifactory/values.yaml
@@ -5,7 +5,9 @@
 
 Name: artifactory
 Component: "Artifactory"
-image: "docker.bintray.io/jfrog/artifactory-pro"
+
+## Uncomment following line if you want to run Artifactory-Pro
+#image: "docker.bintray.io/jfrog/artifactory-pro"
 imageTag: "4.14.1"
 imagePullPolicy: "Always"
 replicaCount: 1