Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Moved Artifactory to stable and updated version to 5.3.2 #1314

Merged
merged 25 commits into from
Jul 6, 2017
Merged

Moved Artifactory to stable and updated version to 5.3.2 #1314

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
266a42b
Upgraded artifactory version to 4.16.0
jainishshah17 Jan 20, 2017
dc1f0cd
Merge branch 'master' of https://github.com/kubernetes/charts
jainishshah17 Feb 24, 2017
f22f5cd
changes as per suggestion
jainishshah17 Mar 10, 2017
73d4a02
Merge remote-tracking branch 'k8s/master'
jainishshah17 Mar 10, 2017
54834d8
Merge remote-tracking branch 'Charts/master'
jainishshah17 Jun 16, 2017
5b9e47b
Added Stable Artifactory chart
jainishshah17 Jun 16, 2017
c7fd27c
removed Incubator Artifactory chart
jainishshah17 Jun 16, 2017
7312c59
Fixed port issue
jainishshah17 Jun 17, 2017
acdffb2
Fixed path
jainishshah17 Jun 17, 2017
ddbd6a8
fixed readme
jainishshah17 Jun 17, 2017
34ce7ff
Added Documentation for all variables.
jainishshah17 Jun 19, 2017
c02d548
Updated labels
jainishshah17 Jun 19, 2017
9e2c8a1
Fixed Parameter names
jainishshah17 Jun 19, 2017
fb226db
Fixed Notes.txt
jainishshah17 Jun 19, 2017
7e68a82
Updated Artifactory version to 5.4.1
jainishshah17 Jun 23, 2017
3e89133
Fixed metadata
jainishshah17 Jun 23, 2017
dc99e38
Merge remote-tracking branch 'Charts/master'
jainishshah17 Jun 25, 2017
d6aeb9d
Fixed naming
jainishshah17 Jun 27, 2017
577b918
Changes.
jainishshah17 Jun 29, 2017
bac7bcb
Merge remote-tracking branch 'Charts/master'
jainishshah17 Jun 29, 2017
a0571f1
Added release name to selector
jainishshah17 Jun 30, 2017
7f3f936
Nginx for Oss and Pro
jainishshah17 Jul 3, 2017
f5e02b2
Fixed readme
jainishshah17 Jul 3, 2017
4a788bd
using secret for database password
jainishshah17 Jul 5, 2017
e55e040
renamed secret to postgresql-secret.yaml
jainishshah17 Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions stable/artifactory/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: artifactory
home: https://www.jfrog.com/artifactory/
version: 5.3.2
appVersion: 5.3.2
version: 5.4.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chart version and app version are two different things. They don't have to be aligned.

appVersion: 5.4.1
description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
keywords:
- artifactory
Expand All @@ -13,4 +13,6 @@ sources:
maintainers:
- name: Jainish shah
email: jainishs@jfrog.com
- name: Eldad Assis
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use the Github username as name. We've started to recommend that because it helps identify the chart maintainer for future review.

email: eldada@jfrog.com
icon: https://raw.githubusercontent.com/JFrogDev/artifactory-dcos/master/images/jfrog_med.png
4 changes: 2 additions & 2 deletions stable/artifactory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ The following tables lists the configurable parameters of the artifactory chart
| `artName` | Artifactory name | `artifactory` |
| `artName.art_replicaCount` | Artifactory replica count | `1` |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

artName.art_replicaCount -> artName.artReplicaCount

| `artImage.repository` | Container image | `docker.bintray.io/jfrog/artifactory-pro` |
| `artImage.version` | Container image tag | `5.3.2` |
| `artImage.version` | Container image tag | `5.4.1` |
| `artService.name` | Artifactory service name | `artifactory` |
| `artService.type`| Artifactory service type | `ClusterIP` |
| `artService.externalPort` | Artifactory service external port | `8081` |
Expand All @@ -94,7 +94,7 @@ The following tables lists the configurable parameters of the artifactory chart
| `nxName` | Nginx name | `nginx` |
| `nxName.artReplicaCount` | Nginx replica count | `1` |
| `nxImage.repository` | Container image | `docker.bintray.io/jfrog/nginx-artifactory-pro` |
| `nxImage.version` | Container image tag | `5.3.2` |
| `nxImage.version` | Container image tag | `5.4.1` |
| `nxService.name` | Nginx service name | `nginx` |
| `nxService.type`| Nginx service type | `LoadBalancer` |
| `nxService.externalPortHttp` | Nginx service external port | `80` |
Expand Down
16 changes: 16 additions & 0 deletions stable/artifactory/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,19 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "databaseName" -}}
{{- printf "%s" .Values.dbName | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "nginxName" -}}
{{- printf "%s" .Values.nxName | trunc 63 | trimSuffix "-" -}}
{{- end -}}
2 changes: 1 addition & 1 deletion stable/artifactory/templates/artifactory-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Values.artName }}
name: {{ template "name" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/artifactory-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.artName }}
name: {{ template "name" . }}
labels:
app: {{ template "fullname" . }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app: {{ template "name" . }}

chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/artifactory-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.artName }}
name: {{ template "name" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/nginx-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Values.nxName }}
name: {{ template "nginxName" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/nginx-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.nxName }}
name: {{ template "nginxName" . }}
labels:
app: {{ template "fullname" . }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app: {{ template "name" . }}

chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/nginx-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.nxName }}
name: {{ template "nginxName" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/postgresql-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Values.dbName }}
name: {{ template "databaseName" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/postgresql-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.dbName }}
name: {{ template "databaseName" . }}
labels:
app: {{ template "fullname" . }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app: {{ template "name" . }}

chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/templates/postgresql-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.dbName }}
name: {{ template "databaseName" . }}
labels:
app: {{ template "name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
Expand Down
4 changes: 2 additions & 2 deletions stable/artifactory/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ artImage:
## Uncomment following line if you want to run Artifactory-Pro
#repository: "docker.bintray.io/jfrog/artifactory-oss"
repository: "docker.bintray.io/jfrog/artifactory-pro"
version: 5.3.2
version: 5.4.1
artService:
name: artifactory
## For minikube, set this to NodePort, elsewhere use LoadBalancer
Expand All @@ -56,7 +56,7 @@ nxName: nginx
nxReplicaCount: 1
nxImage:
repository: docker.bintray.io/jfrog/nginx-artifactory-pro
version: 5.3.2
version: 5.4.1
nxService:
name: nginx
## For minikube, set this to NodePort, elsewhere use LoadBalancer
Expand Down