Commit 74fe7124 authored by 陈健's avatar 陈健

使用helm创建的模板chart包

parent 5fd76139
......@@ -98,9 +98,9 @@ podTemplate(label: pod_label, cloud: 'kubernetes', containers: [
container('helm') {
stage('helm deploy') {
sh "sed -i \"s/tag: dev/tag: dev-${env.BUILD_ID}/g\" oidcExample/values.yaml"
//sh "helm upgrade --install oidc-example --namespace paas oidc-example/ -f oidcExample/values.yaml"
sh "helm package --save=false oidcExample"
sh "sed -i \"s/tag: dev/tag: dev-${env.BUILD_ID}/g\" oidcexample/values.yaml"
//sh "helm upgrade --install oidc-example --namespace paas oidc-example/ -f oidcexample/values.yaml"
sh "helm package --save=false oidcexample"
sh "cp *.tgz /mnt/charts/"
}
......
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: oidcExample
name: oidcexample
version: "0.1.0"
......@@ -6,16 +6,16 @@
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oidcExample.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oidcexample.fullname" . }})
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.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oidcExample.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oidcExample.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oidcexample.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oidcexample.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oidcExample.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oidcexample.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80
{{- end }}
......@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "oidcExample.name" -}}
{{- define "oidcexample.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
......@@ -11,7 +11,7 @@ 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).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oidcExample.fullname" -}}
{{- define "oidcexample.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
......@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oidcExample.chart" -}}
{{- define "oidcexample.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oidcExample.labels" -}}
app.kubernetes.io/name: {{ include "oidcExample.name" . }}
helm.sh/chart: {{ include "oidcExample.chart" . }}
{{- define "oidcexample.labels" -}}
app.kubernetes.io/name: {{ include "oidcexample.name" . }}
helm.sh/chart: {{ include "oidcexample.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
......
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "oidcExample.fullname" . }}
name: {{ include "oidcexample.fullname" . }}
labels:
{{ include "oidcExample.labels" . | indent 4 }}
{{ include "oidcexample.labels" . | indent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "oidcExample.name" . }}
app.kubernetes.io/name: {{ include "oidcexample.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "oidcExample.name" . }}
app.kubernetes.io/name: {{ include "oidcexample.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
{{- with .Values.imagePullSecrets }}
......
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "oidcExample.fullname" . -}}
{{- $fullName := include "oidcexample.fullname" . -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{ include "oidcExample.labels" . | indent 4 }}
{{ include "oidcexample.labels" . | indent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
......
apiVersion: v1
kind: Service
metadata:
name: {{ include "oidcExample.fullname" . }}
name: {{ include "oidcexample.fullname" . }}
labels:
{{ include "oidcExample.labels" . | indent 4 }}
{{ include "oidcexample.labels" . | indent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
......@@ -13,5 +13,5 @@ spec:
nodePort: {{ .Values.service.nodePort }}
name: http
selector:
app.kubernetes.io/name: {{ include "oidcExample.name" . }}
app.kubernetes.io/name: {{ include "oidcexample.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "oidcExample.fullname" . }}-test-connection"
name: "{{ include "oidcexample.fullname" . }}-test-connection"
labels:
{{ include "oidcExample.labels" . | indent 4 }}
{{ include "oidcexample.labels" . | indent 4 }}
annotations:
"helm.sh/hook": test-success
spec:
......@@ -11,5 +11,5 @@ spec:
- name: wget
image: busybox
command: ['wget']
args: ['{{ include "oidcExample.fullname" . }}:{{ .Values.service.port }}']
args: ['{{ include "oidcexample.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
# Default values for oidcExample.
# Default values for oidcexample.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
......@@ -16,7 +16,6 @@ fullnameOverride: "oidc-example"
service:
type: ClusterIP
port: 80
nodePort: 8080
ingress:
enabled: true
......@@ -24,8 +23,9 @@ ingress:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
- host: exmaple.dev.k2paas.com
paths: []
- host: example.dev.k2paas.com
paths:
- /
tls: []
# - secretName: chart-example-tls
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment