Commit dd6c88c5 authored by 舒成's avatar 舒成

update

parent 9da96508
This diff is collapsed.
......@@ -178,4 +178,16 @@ helm install \
# uninstall
helm delete harbor --purge
# update
helm upgrade harbor /etc/kubernetes/helm/harbor \
-f /etc/kubernetes/helm/harbor/values-overrides.yaml
# template
helm template \
/etc/kubernetes/helm/harbor \
--name=harbor \
--namespace=devops \
-f /etc/kubernetes/helm/harbor/values-overrides.yaml \
> /etc/kubernetes/helm/harbor/dist.yaml
```
\ No newline at end of file
......@@ -26,7 +26,6 @@ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
{{/* matchLabels */}}
{{- define "harbor.matchLabels" -}}
release: {{ .Release.Name }}
app: "{{ template "harbor.name" . }}"
{{- end -}}
{{- define "harbor.externalURL" -}}
......
......@@ -6,7 +6,7 @@ metadata:
labels:
{{ include "harbor.labels" . | indent 4 }}
app: harbor-database
version: {{ .Values.busybox.image.tag }}
version: {{ .Values.database.internal.image.tag }}
spec:
replicas: 1
serviceName: "{{ template "harbor.fullname" . }}-database"
......@@ -19,7 +19,7 @@ spec:
labels:
{{ include "harbor.labels" . | indent 8 }}
app: harbor-database
version: {{ .Values.busybox.image.tag }}
version: {{ .Values.database.internal.image.tag }}
spec:
initContainers:
- name: "remove-lost-found"
......
......@@ -2,7 +2,7 @@
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: "{{ template "harbor.fullname" . }}"-notary
name: {{ template "harbor.fullname" . }}-notary
spec:
selector:
istio: ingressgateway # use istio default controller
......@@ -17,12 +17,12 @@ spec:
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: "{{ template "harbor.fullname" . }}"-notary
name: {{ template "harbor.fullname" . }}-notary
spec:
hosts:
- "{{ template "harbor.notaryFQDN" . }}"
gateways:
- "{{ template "harbor.fullname" . }}"-notary
- {{ template "harbor.fullname" . }}-notary
http:
- route:
- destination:
......
......@@ -2,7 +2,7 @@
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: "{{ template "harbor.fullname" . }}"-ui
name: {{ template "harbor.fullname" . }}-ui
spec:
selector:
istio: ingressgateway # use istio default controller
......@@ -17,12 +17,12 @@ spec:
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: "{{ template "harbor.fullname" . }}"-ui
name: {{ template "harbor.fullname" . }}-ui
spec:
hosts:
- "{{ .Values.externalDomain }}"
gateways:
- "{{ template "harbor.fullname" . }}"-ui
- {{ template "harbor.fullname" . }}-ui
http:
- route:
- destination:
......
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