Commit dd6c88c5 authored by 舒成's avatar 舒成

update

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