Commit b427f691 authored by 舒成's avatar 舒成

update

parent bef88d4a
# images
```bash
docker pull goharbor/harbor-ui:dev && \
docker tag goharbor/harbor-ui:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:dev
# harbor-ui
docker pull goharbor/harbor-ui:v1.6.0 && \
docker tag goharbor/harbor-ui:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0
docker pull goharbor/harbor-adminserver:dev && \
docker tag goharbor/harbor-adminserver:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:dev
# harbor-adminserver
docker pull goharbor/harbor-adminserver:v1.6.0 && \
docker tag goharbor/harbor-adminserver:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0
docker pull goharbor/harbor-jobservice:dev && \
docker tag goharbor/harbor-jobservice:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:dev
# harbor-jobservice
docker pull goharbor/harbor-jobservice:v1.6.0 && \
docker tag goharbor/harbor-jobservice:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0
docker pull goharbor/harbor-db:dev && \
docker tag goharbor/harbor-db:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:dev
# harbor-db
docker pull goharbor/harbor-db:v1.6.0 && \
docker tag goharbor/harbor-db:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0
docker pull goharbor/registry-photon:dev && \
docker tag goharbor/registry-photon:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/registry-photon:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry-photon:dev
# chartmuseum
docker pull chartmuseum/chartmuseum:v0.7.1 && \
docker tag chartmuseum/chartmuseum:v0.7.1 registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1
docker pull goharbor/chartmuseum-photon:dev && \
docker tag goharbor/chartmuseum-photon:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:dev
# clair
docker pull quay.io/coreos/clair:v2.0.6 && \
docker tag quay.io/coreos/clair:v2.0.6 registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6
docker pull goharbor/clair-photon:dev && \
docker tag goharbor/clair-photon:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:dev
# notary:server
docker pull notary:server-0.5.0 && \
docker tag notary:server-0.5.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0
docker pull goharbor/notary-server-photon:dev && \
docker tag goharbor/notary-server-photon:dev registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:dev && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:dev
# notary:signer
docker pull notary:signer-0.5.0 && \
docker tag notary:signer-0.5.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer:0.5.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer:0.5.0
# registry
docker pull registry:2.6.2 && \
docker tag registry:2.6.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.6.2 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.6.2
# nginx
docker pull nginx:1.15.2-alpine && \
docker tag nginx:1.15.2-alpine registry-vpc.cn-qingdao.aliyuncs.com/wod/nginx:1.15.2-alpine && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/nginx:1.15.2-alpine
# redis
docker pull redis:4.0.1-alpine && \
docker tag redis:4.0.1-alpine registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.0.1-alpine && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.0.1-alpine
```
# setup
```powershell
# 1.template
cd /etc/kubernetes/helm/harbor && helm template . --name harbor --namespace devops > ./dist/harbor.yaml
# 2.helm install
helm install /etc/kubernetes/helm/harbor \
--name harbor \
--namespace devops \
--set harborAdminPassword=spaceIN511 \
--set nodeSelector.kubernetes\.io/hostname=172.31.14.41 \
--set externalDomain=harbor.wodcloud.com
## overrides
```bash
cat /etc/kubernetes/helm/harbor/values-overrides.yaml
```
```yaml
persistence:
enabled: true
externalProtocol: https
externalDomain: harbor.wodcloud.local
harborAdminPassword: "58772015"
ingress:
enabled: true
adminserver:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
tag: v1.6.0
volumes:
config:
storageClass: "storageos"
accessMode: ReadWriteOnce
size: 1Gi
jobservice:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
tag: v1.6.0
ui:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
tag: v1.6.0
busybox:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
tag: 1.29
database:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
tag: v1.6.0
password: "spaceIN511"
volumes:
data:
storageClass: "storageos"
accessMode: ReadWriteOnce
size: 1Gi
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.6.2
volumes:
data:
# storageClass: "-"
accessMode: ReadWriteOnce
size: 5Gi
nodeSelector:
harbor-registry: enabled
chartmuseum:
enabled: true
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
tag: v0.7.1
volumes:
data:
storageClass: "storageos"
accessMode: ReadWriteOnce
size: 5Gi
clair:
enabled: true
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/clair
tag: v2.0.6
volumes:
pgData:
storageClass: "storageos"
accessMode: ReadWriteOnce
size: 1Gi
redis:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/redis
tag: 4.0.1-alpine
usePassword: false
cluster:
enabled: false
master:
persistence:
enabled: false
notary:
enabled: true
server:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
tag: 0.5.0
signer:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
tag: 0.5.0
```
# images
## setup
```bash
docker pull goharbor/harbor-ui:v1.6.0 && \
docker tag goharbor/harbor-ui:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0
docker pull goharbor/harbor-adminserver:v1.6.0 && \
docker tag goharbor/harbor-adminserver:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0
docker pull goharbor/harbor-jobservice:v1.6.0 && \
docker tag goharbor/harbor-jobservice:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0
docker pull goharbor/harbor-db:v1.6.0 && \
docker tag goharbor/harbor-db:v1.6.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0
# 1.install
docker pull chartmuseum/chartmuseum:v0.7.1 && \
docker tag chartmuseum/chartmuseum:v0.7.1 registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1
# label node
kubectl label node <nodename> harbor-registry=enabled
docker pull quay.io/coreos/clair:v2.0.6 && \
docker tag quay.io/coreos/clair:v2.0.6 registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6
helm install \
/etc/kubernetes/helm/harbor \
--name=harbor \
--namespace=devops \
-f /etc/kubernetes/helm/harbor/values-overrides.yaml
docker pull notary:server-0.5.0 && \
docker tag notary:server-0.5.0 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0 && \
docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0
# uninstall
helm delete harbor --purge
```
\ No newline at end of file
......@@ -21,7 +21,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app: "{{ template "harbor.name" . }}"
{{- end -}}
{{/* matchLabels */}}
......
......@@ -4,7 +4,7 @@ metadata:
name: "{{ template "harbor.fullname" . }}-adminserver"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: adminserver
app: harbor-adminserver
data:
POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}"
POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}"
......
......@@ -4,7 +4,7 @@ metadata:
name: "{{ template "harbor.fullname" . }}-adminserver"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: adminserver
app: harbor-adminserver
type: Opaque
data:
secretKey: {{ .Values.secretKey | b64enc | quote }}
......
......@@ -4,19 +4,19 @@ metadata:
name: "{{ template "harbor.fullname" . }}-adminserver"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: adminserver
app: harbor-adminserver
spec:
replicas: 1
serviceName: "{{ template "harbor.fullname" . }}-adminserver"
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: adminserver
app: harbor-adminserver
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: adminserver
app: harbor-adminserver
spec:
containers:
- name: adminserver
......
......@@ -8,4 +8,4 @@ spec:
targetPort: 8080
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: adminserver
\ No newline at end of file
app: harbor-adminserver
\ No newline at end of file
......@@ -5,19 +5,19 @@ metadata:
name: "{{ template "harbor.fullname" . }}-chartmuseum"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: chartmuseum
app: harbor-chartmuseum
spec:
replicas: 1
serviceName: "{{ template "harbor.fullname" . }}-chartmuseum"
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: chartmuseum
app: harbor-chartmuseum
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: chartmuseum
app: harbor-chartmuseum
spec:
containers:
- name: chartmuseum
......
......@@ -11,5 +11,5 @@ spec:
targetPort: 9999
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: chartmuseum
app: harbor-chartmuseum
{{- end }}
\ No newline at end of file
......@@ -5,7 +5,7 @@ metadata:
name: {{ template "harbor.fullname" . }}-clair
labels:
{{ include "harbor.labels" . | indent 4 }}
component: clair
app: harbor-clair
data:
config.yaml: |
clair:
......
......@@ -5,18 +5,18 @@ metadata:
name: {{ template "harbor.fullname" . }}-clair
labels:
{{ include "harbor.labels" . | indent 4 }}
component: clair
app: harbor-clair
spec:
replicas: 1
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: clair
app: harbor-clair
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: clair
app: harbor-clair
spec:
containers:
- name: clair
......
......@@ -13,5 +13,5 @@ spec:
- port: 6060
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: clair
app: harbor-clair
{{ end }}
......@@ -5,19 +5,19 @@ metadata:
name: "{{ template "harbor.fullname" . }}-database"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: database
app: harbor-database
spec:
replicas: 1
serviceName: "{{ template "harbor.fullname" . }}-database"
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: database
app: harbor-database
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: database
app: harbor-database
spec:
initContainers:
- name: "remove-lost-found"
......
......@@ -10,5 +10,5 @@ spec:
- port: 5432
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: database
app: harbor-database
{{- end -}}
\ No newline at end of file
......@@ -4,18 +4,18 @@ metadata:
name: "{{ template "harbor.fullname" . }}-jobservice"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: jobservice
app: harbor-jobservice
spec:
replicas: 1
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: jobservice
app: harbor-jobservice
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: jobservice
app: harbor-jobservice
spec:
containers:
- name: jobservice
......
......@@ -10,4 +10,4 @@ spec:
targetPort: 8080
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: jobservice
app: harbor-jobservice
......@@ -5,7 +5,7 @@ metadata:
name: {{ template "harbor.fullname" . }}-notary
labels:
{{ include "harbor.labels" . | indent 4 }}
component: notary
app: harbor-notary
data:
{{ $ca := genCA "harbor-notary-ca" 3650 }}
{{ $cert := genSignedCert (printf "%s-notary-signer" (include "harbor.fullname" .)) nil nil 3650 $ca }}
......
......@@ -5,18 +5,18 @@ metadata:
name: {{ template "harbor.fullname" . }}-notary-server
labels:
{{ include "harbor.labels" . | indent 4 }}
component: notary-server
app: harbor-notary-server
spec:
replicas: 1
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: notary-server
app: harbor-notary-server
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: notary-server
app: harbor-notary-server
spec:
containers:
- name: notary-server
......
......@@ -5,18 +5,18 @@ metadata:
name: {{ template "harbor.fullname" . }}-notary-signer
labels:
{{ include "harbor.labels" . | indent 4 }}
component: notary-signer
app: harbor-notary-signer
spec:
replicas: 1
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: notary-signer
app: harbor-notary-signer
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: notary-signer
app: harbor-notary-signer
spec:
containers:
- name: notary-signer
......
......@@ -10,7 +10,7 @@ spec:
- port: 4443
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: notary-server
app: harbor-notary-server
---
apiVersion: v1
......@@ -24,5 +24,5 @@ spec:
- port: 7899
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: notary-signer
app: harbor-notary-signer
{{ end }}
\ No newline at end of file
......@@ -5,14 +5,14 @@ metadata:
name: {{ template "harbor.fullname" . }}-redis
labels:
{{ include "harbor.labels" . | indent 4 }}
component: redis
app: harbor-redis
spec:
replicas: 1
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: redis
app: harbor-redis
spec:
containers:
- name: redis
......
......@@ -5,11 +5,11 @@ metadata:
name: {{ template "harbor.fullname" . }}-redis
labels:
{{ include "harbor.labels" . | indent 4 }}
component: redis
app: harbor-redis
spec:
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: redis
app: harbor-redis
ports:
- name: redis
port: 6379
\ No newline at end of file
......@@ -4,19 +4,19 @@ metadata:
name: "{{ template "harbor.fullname" . }}-registry"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: registry
app: harbor-registry
spec:
replicas: 1
serviceName: "{{ template "harbor.fullname" . }}-registry"
selector:
matchLabels:
{{ include "harbor.matchLabels" . | indent 6 }}
component: registry
app: harbor-registry
template:
metadata:
labels:
{{ include "harbor.labels" . | indent 8 }}
component: registry
app: harbor-registry
spec:
containers:
- name: registry
......
......@@ -9,4 +9,4 @@ spec:
- port: 5000
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: registry
\ No newline at end of file
app: harbor-registry
\ No newline at end of file
......@@ -4,14 +4,14 @@ metadata:
name: "{{ template "harbor.fullname" . }}-ui"
labels:
{{ include "harbor.labels" . | indent 4 }}
component: ui
app: harbor-ui
spec:
replicas: 1
template:
metadata:
labels:
{{ include "harbor.matchLabels" . | indent 8 }}
component: ui
app: harbor-ui
spec:
containers:
- name: ui
......
......@@ -10,4 +10,4 @@ spec:
targetPort: 8080
selector:
{{ include "harbor.matchLabels" . | indent 4 }}
component: ui
app: harbor-ui
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