From d534b0aa3eeb073cb287a3500679dc87ab2de7f5 Mon Sep 17 00:00:00 2001 From: shucheng Date: Sat, 10 Nov 2018 22:39:35 +0800 Subject: [PATCH] update --- readme.md | 113 +++++++++--------- .../{adminserver-cm.yaml => configmap.yaml} | 0 .../{adminserver-secrets.yaml => secret.yaml} | 0 .../{adminserver-svc.yaml => service.yaml} | 0 .../{adminserver-ss.yaml => statefulset.yaml} | 0 .../{chartmuseum-cm.yaml => configmap.yaml} | 0 .../{chartmuseum-secret.yaml => secret.yaml} | 0 .../{chartmuseum-svc.yaml => service.yaml} | 0 .../{chartmuseum-ss.yaml => statefulset.yaml} | 0 .../clair/{clair-cm.yaml => configmap.yaml} | 0 .../clair/{clair-dpl.yaml => deployment.yaml} | 0 .../clair/{clair-svc.yaml => service.yaml} | 0 .../{database-secret.yaml => secret.yaml} | 0 .../{database-svc.yaml => service.yaml} | 0 .../{database-ss.yaml => statefulset.yaml} | 0 .../{jobservice-cm.yaml => configmap.yaml} | 0 .../{jobservice-dpl.yaml => deployment.yaml} | 0 .../{jobservice-secrets.yaml => secret.yaml} | 0 .../{jobservice-svc.yaml => service.yaml} | 0 .../notary/{notary-cm.yaml => configmap.yaml} | 0 .../notary/{notary-svc.yaml => service.yaml} | 0 .../redis/{redis.dp.yml => deployment.yml} | 0 .../redis/{redis.svc.yml => service.yml} | 0 .../{registry-cm.yaml => configmap.yaml} | 0 .../{registry-secret.yaml => secret.yaml} | 0 .../{registry-svc.yaml => service.yaml} | 0 .../{registry-ss.yaml => statefulset.yaml} | 0 templates/ui/{ui-cm.yaml => configmap.yaml} | 0 templates/ui/{ui-dpl.yaml => deployment.yaml} | 0 templates/ui/{ui-secrets.yaml => secret.yaml} | 0 templates/ui/{ui-svc.yaml => service.yaml} | 0 31 files changed, 56 insertions(+), 57 deletions(-) rename templates/adminserver/{adminserver-cm.yaml => configmap.yaml} (100%) rename templates/adminserver/{adminserver-secrets.yaml => secret.yaml} (100%) rename templates/adminserver/{adminserver-svc.yaml => service.yaml} (100%) rename templates/adminserver/{adminserver-ss.yaml => statefulset.yaml} (100%) rename templates/chartmuseum/{chartmuseum-cm.yaml => configmap.yaml} (100%) rename templates/chartmuseum/{chartmuseum-secret.yaml => secret.yaml} (100%) rename templates/chartmuseum/{chartmuseum-svc.yaml => service.yaml} (100%) rename templates/chartmuseum/{chartmuseum-ss.yaml => statefulset.yaml} (100%) rename templates/clair/{clair-cm.yaml => configmap.yaml} (100%) rename templates/clair/{clair-dpl.yaml => deployment.yaml} (100%) rename templates/clair/{clair-svc.yaml => service.yaml} (100%) rename templates/database/{database-secret.yaml => secret.yaml} (100%) rename templates/database/{database-svc.yaml => service.yaml} (100%) rename templates/database/{database-ss.yaml => statefulset.yaml} (100%) rename templates/jobservice/{jobservice-cm.yaml => configmap.yaml} (100%) rename templates/jobservice/{jobservice-dpl.yaml => deployment.yaml} (100%) rename templates/jobservice/{jobservice-secrets.yaml => secret.yaml} (100%) rename templates/jobservice/{jobservice-svc.yaml => service.yaml} (100%) rename templates/notary/{notary-cm.yaml => configmap.yaml} (100%) rename templates/notary/{notary-svc.yaml => service.yaml} (100%) rename templates/redis/{redis.dp.yml => deployment.yml} (100%) rename templates/redis/{redis.svc.yml => service.yml} (100%) rename templates/registry/{registry-cm.yaml => configmap.yaml} (100%) rename templates/registry/{registry-secret.yaml => secret.yaml} (100%) rename templates/registry/{registry-svc.yaml => service.yaml} (100%) rename templates/registry/{registry-ss.yaml => statefulset.yaml} (100%) rename templates/ui/{ui-cm.yaml => configmap.yaml} (100%) rename templates/ui/{ui-dpl.yaml => deployment.yaml} (100%) rename templates/ui/{ui-secrets.yaml => secret.yaml} (100%) rename templates/ui/{ui-svc.yaml => service.yaml} (100%) diff --git a/readme.md b/readme.md index 0a9fb4b..d432dbb 100644 --- a/readme.md +++ b/readme.md @@ -1,56 +1,3 @@ -# images -```bash -# 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 - -# 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 - -# 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 - -# 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 - -# 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 - -# 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 - -# 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 - -# 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 - -# 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 ```bash # 1.install @@ -90,7 +37,7 @@ cat /etc/kubernetes/helm/harbor/values-overrides.yaml persistence: enabled: true externalProtocol: https -externalDomain: harbor.local +externalDomain: hub.wodcloud.local harborAdminPassword: "passwd" ingress: @@ -203,12 +150,11 @@ harbor-registry: enabled kubectl label node harbor-adminserver=enabled ``` - ```yaml persistence: enabled: false externalProtocol: https -externalDomain: harbor.local +externalDomain: hub.wodcloud.local harborAdminPassword: "passwd" ingress: @@ -249,7 +195,7 @@ registry: image: repository: registry.cn-qingdao.aliyuncs.com/wod/registry tag: 2.6.2 - hostpath: /etc/kubernetes/data/registry + hostpath: /data/registry nodeSelector: harbor-registry: enabled @@ -286,4 +232,57 @@ notary: image: repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon tag: dev +``` + +# images +```bash +# 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 + +# 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 + +# 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 + +# 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 + +# 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 + +# 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 + +# 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 + +# 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 + +# 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 ``` \ No newline at end of file diff --git a/templates/adminserver/adminserver-cm.yaml b/templates/adminserver/configmap.yaml similarity index 100% rename from templates/adminserver/adminserver-cm.yaml rename to templates/adminserver/configmap.yaml diff --git a/templates/adminserver/adminserver-secrets.yaml b/templates/adminserver/secret.yaml similarity index 100% rename from templates/adminserver/adminserver-secrets.yaml rename to templates/adminserver/secret.yaml diff --git a/templates/adminserver/adminserver-svc.yaml b/templates/adminserver/service.yaml similarity index 100% rename from templates/adminserver/adminserver-svc.yaml rename to templates/adminserver/service.yaml diff --git a/templates/adminserver/adminserver-ss.yaml b/templates/adminserver/statefulset.yaml similarity index 100% rename from templates/adminserver/adminserver-ss.yaml rename to templates/adminserver/statefulset.yaml diff --git a/templates/chartmuseum/chartmuseum-cm.yaml b/templates/chartmuseum/configmap.yaml similarity index 100% rename from templates/chartmuseum/chartmuseum-cm.yaml rename to templates/chartmuseum/configmap.yaml diff --git a/templates/chartmuseum/chartmuseum-secret.yaml b/templates/chartmuseum/secret.yaml similarity index 100% rename from templates/chartmuseum/chartmuseum-secret.yaml rename to templates/chartmuseum/secret.yaml diff --git a/templates/chartmuseum/chartmuseum-svc.yaml b/templates/chartmuseum/service.yaml similarity index 100% rename from templates/chartmuseum/chartmuseum-svc.yaml rename to templates/chartmuseum/service.yaml diff --git a/templates/chartmuseum/chartmuseum-ss.yaml b/templates/chartmuseum/statefulset.yaml similarity index 100% rename from templates/chartmuseum/chartmuseum-ss.yaml rename to templates/chartmuseum/statefulset.yaml diff --git a/templates/clair/clair-cm.yaml b/templates/clair/configmap.yaml similarity index 100% rename from templates/clair/clair-cm.yaml rename to templates/clair/configmap.yaml diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/deployment.yaml similarity index 100% rename from templates/clair/clair-dpl.yaml rename to templates/clair/deployment.yaml diff --git a/templates/clair/clair-svc.yaml b/templates/clair/service.yaml similarity index 100% rename from templates/clair/clair-svc.yaml rename to templates/clair/service.yaml diff --git a/templates/database/database-secret.yaml b/templates/database/secret.yaml similarity index 100% rename from templates/database/database-secret.yaml rename to templates/database/secret.yaml diff --git a/templates/database/database-svc.yaml b/templates/database/service.yaml similarity index 100% rename from templates/database/database-svc.yaml rename to templates/database/service.yaml diff --git a/templates/database/database-ss.yaml b/templates/database/statefulset.yaml similarity index 100% rename from templates/database/database-ss.yaml rename to templates/database/statefulset.yaml diff --git a/templates/jobservice/jobservice-cm.yaml b/templates/jobservice/configmap.yaml similarity index 100% rename from templates/jobservice/jobservice-cm.yaml rename to templates/jobservice/configmap.yaml diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/deployment.yaml similarity index 100% rename from templates/jobservice/jobservice-dpl.yaml rename to templates/jobservice/deployment.yaml diff --git a/templates/jobservice/jobservice-secrets.yaml b/templates/jobservice/secret.yaml similarity index 100% rename from templates/jobservice/jobservice-secrets.yaml rename to templates/jobservice/secret.yaml diff --git a/templates/jobservice/jobservice-svc.yaml b/templates/jobservice/service.yaml similarity index 100% rename from templates/jobservice/jobservice-svc.yaml rename to templates/jobservice/service.yaml diff --git a/templates/notary/notary-cm.yaml b/templates/notary/configmap.yaml similarity index 100% rename from templates/notary/notary-cm.yaml rename to templates/notary/configmap.yaml diff --git a/templates/notary/notary-svc.yaml b/templates/notary/service.yaml similarity index 100% rename from templates/notary/notary-svc.yaml rename to templates/notary/service.yaml diff --git a/templates/redis/redis.dp.yml b/templates/redis/deployment.yml similarity index 100% rename from templates/redis/redis.dp.yml rename to templates/redis/deployment.yml diff --git a/templates/redis/redis.svc.yml b/templates/redis/service.yml similarity index 100% rename from templates/redis/redis.svc.yml rename to templates/redis/service.yml diff --git a/templates/registry/registry-cm.yaml b/templates/registry/configmap.yaml similarity index 100% rename from templates/registry/registry-cm.yaml rename to templates/registry/configmap.yaml diff --git a/templates/registry/registry-secret.yaml b/templates/registry/secret.yaml similarity index 100% rename from templates/registry/registry-secret.yaml rename to templates/registry/secret.yaml diff --git a/templates/registry/registry-svc.yaml b/templates/registry/service.yaml similarity index 100% rename from templates/registry/registry-svc.yaml rename to templates/registry/service.yaml diff --git a/templates/registry/registry-ss.yaml b/templates/registry/statefulset.yaml similarity index 100% rename from templates/registry/registry-ss.yaml rename to templates/registry/statefulset.yaml diff --git a/templates/ui/ui-cm.yaml b/templates/ui/configmap.yaml similarity index 100% rename from templates/ui/ui-cm.yaml rename to templates/ui/configmap.yaml diff --git a/templates/ui/ui-dpl.yaml b/templates/ui/deployment.yaml similarity index 100% rename from templates/ui/ui-dpl.yaml rename to templates/ui/deployment.yaml diff --git a/templates/ui/ui-secrets.yaml b/templates/ui/secret.yaml similarity index 100% rename from templates/ui/ui-secrets.yaml rename to templates/ui/secret.yaml diff --git a/templates/ui/ui-svc.yaml b/templates/ui/service.yaml similarity index 100% rename from templates/ui/ui-svc.yaml rename to templates/ui/service.yaml -- 2.26.0