github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/artifactory] #1785 namespace defined templates with chart name (#1977)

Browse Source 
* [stable/artifactory] #1785 namespace defined templates with chart name

* Update Chart.yaml

fix version bump
This commit is contained in:
kevinschumacher
2017-09-10 14:49:42 -05:00
committed by Michael Goodness
parent 0243aaecaf
commit 857fd2e6dc
13 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/artifactory/Chart.yaml
+9 -8
View File
@@ -1,18 +1,19 @@
apiVersion: v1
name: artifactory
home: https://www.jfrog.com/artifactory/
version: 5.4.6-3
version: 6.0.0
appVersion: 5.4.6
description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
description: Universal Repository Manager supporting all major packaging formats,
build tools and CI servers.
keywords:
- artifactory
- jfrog
sources:
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/JFrogDev
- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
- https://github.com/JFrogDev
maintainers:
- name: jainishshah17
email: jainishs@jfrog.com
- name: eldada
email: eldada@jfrog.com
- name: jainishshah17
email: jainishs@jfrog.com
- name: eldada
email: eldada@jfrog.com
icon: https://raw.githubusercontent.com/JFrogDev/artifactory-dcos/master/images/jfrog_med.png
stable/artifactory/templates/NOTES.txt
+3 -3
View File
@@ -3,15 +3,15 @@ Congratulations. You have just deployed JFrog Artifactory Pro!
1. Get the Artifactory URL by running these commands:
{{- if contains "NodePort" .Values.nginx.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "nginx.name" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "artifactory.nginx.name" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT/
{{- else if contains "LoadBalancer" .Values.nginx.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of the service by running 'kubectl get svc -w {{ template "nginx.name" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nginx.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of the service by running 'kubectl get svc -w {{ template "artifactory.nginx.name" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory.nginx.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP/
{{- else if contains "ClusterIP" .Values.nginx.service.type }}
stable/artifactory/templates/_helpers.tpl
+8 -8
View File
@@ -2,28 +2,28 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- define "artifactory.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Expand the name artifactory service.
*/}}
{{- define "artifactory.name" -}}
{{- define "artifactory.artifactory.name" -}}
{{- default .Values.artifactory.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Expand the name database service.
*/}}
{{- define "database.name" -}}
{{- define "artifactory.database.name" -}}
{{- default .Values.database.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Expand the name nginx service.
*/}}
{{- define "nginx.name" -}}
{{- define "artifactory.nginx.name" -}}
{{- default .Values.nginx.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -32,7 +32,7 @@ Expand the name nginx service.
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 "fullname" -}}
{{- define "artifactory.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -41,7 +41,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
Create a default fully qualified application name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "artifactory.fullname" -}}
{{- define "artifactory.artifactory.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s-%s" .Release.Name $name .Values.artifactory.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -50,7 +50,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
Create a default fully qualified database name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "database.fullname" -}}
{{- define "artifactory.database.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s-%s" .Release.Name $name .Values.database.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -59,7 +59,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
Create a default fully qualified nginx name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "nginx.fullname" -}}
{{- define "artifactory.nginx.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s-%s" .Release.Name $name .Values.nginx.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
stable/artifactory/templates/artifactory-deployment.yaml
+6 -6
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "artifactory.fullname" . }}
name: {{ template "artifactory.artifactory.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.artifactory.name }}"
heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
template:
metadata:
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.artifactory.name }}"
release: {{ .Release.Name }}
spec:
@@ -40,10 +40,10 @@ spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "artifactory.fullname" . }}
key: artifactory-database-password
- name: DB_HOST
value: {{ template "database.name" . }}
value: {{ template "artifactory.database.name" . }}
ports:
- containerPort: {{ .Values.artifactory.internalPort }}
volumeMounts:
@@ -53,7 +53,7 @@ spec:
- name: artifactory-volume
{{- if .Values.artifactory.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "artifactory.fullname" . }}
claimName: {{ template "artifactory.artifactory.fullname" . }}
{{- else }}
emptyDir: {}
{{- end -}}
stable/artifactory/templates/artifactory-pvc.yaml
+2 -2
View File
@@ -2,9 +2,9 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "artifactory.fullname" . }}
name: {{ template "artifactory.artifactory.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
stable/artifactory/templates/artifactory-service.yaml
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "artifactory.name" . }}
name: {{ template "artifactory.artifactory.name" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.artifactory.name }}"
heritage: {{ .Release.Service }}
@@ -16,6 +16,6 @@ spec:
protocol: TCP
name: {{ .Release.Name }}
selector:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.artifactory.name }}"
release: {{ .Release.Name }}
stable/artifactory/templates/nginx-deployment.yaml
+4 -4
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "nginx.fullname" . }}
name: {{ template "artifactory.nginx.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.nginx.name }}"
heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
template:
metadata:
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.nginx.name }}"
release: {{ .Release.Name }}
spec:
@@ -47,7 +47,7 @@ spec:
- name: nginx-volume
{{- if .Values.nginx.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "nginx.fullname" . }}
claimName: {{ template "artifactory.nginx.fullname" . }}
{{- else }}
emptyDir: {}
{{- end -}}
stable/artifactory/templates/nginx-pvc.yaml
+2 -2
View File
@@ -2,9 +2,9 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "nginx.fullname" . }}
name: {{ template "artifactory.nginx.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
stable/artifactory/templates/nginx-service.yaml
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "nginx.name" . }}
name: {{ template "artifactory.nginx.name" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.nginx.name }}"
heritage: {{ .Release.Service }}
@@ -20,6 +20,6 @@ spec:
protocol: TCP
name: {{ .Release.Name }}https
selector:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.nginx.name }}"
release: {{ .Release.Name }}
stable/artifactory/templates/postgresql-deployment.yaml
+5 -5
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "database.fullname" . }}
name: {{ template "artifactory.database.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.database.name }}"
heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
template:
metadata:
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.database.name }}"
release: {{ .Release.Name }}
spec:
@@ -40,7 +40,7 @@ spec:
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "artifactory.fullname" . }}
key: artifactory-database-password
ports:
- containerPort: {{ .Values.database.internalPort }}
@@ -51,7 +51,7 @@ spec:
- name: postgresql-volume
{{- if .Values.database.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "database.fullname" . }}
claimName: {{ template "artifactory.database.fullname" . }}
{{- else }}
emptyDir: {}
{{- end -}}
stable/artifactory/templates/postgresql-pvc.yaml
+2 -2
View File
@@ -2,9 +2,9 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "database.fullname" . }}
name: {{ template "artifactory.database.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
stable/artifactory/templates/postgresql-secret.yaml
+2 -2
View File
@@ -2,11 +2,11 @@ apiVersion: v1
kind: Secret
metadata:
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
name: {{ template "fullname" . }}
name: {{ template "artifactory.fullname" . }}
type: Opaque
data:
{{- if .Values.database.env.pass }}
stable/artifactory/templates/postgresql-service.yaml
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "database.name" . }}
name: {{ template "artifactory.database.name" . }}
labels:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.database.name }}"
heritage: {{ .Release.Service }}
@@ -16,6 +16,6 @@ spec:
protocol: TCP
name: {{ .Release.Name }}
selector:
app: {{ template "name" . }}
app: {{ template "artifactory.name" . }}
component: "{{ .Values.database.name }}"
release: {{ .Release.Name }}