Skip to content

H
harbor
Commit 1850c4cb authored by 舒成's avatar 舒成
Browse files
Options

v2.1.3

parent 007cbd96
Pipeline #45554 failed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 31 additions and 27 deletions
    .beagle.yml
    View file @ 1850c4cb
    ...@@ -16,7 +16,7 @@ pipeline: ...@@ -16,7 +16,7 @@ pipeline:
    volumes: volumes:
    - /data/downloads/k8s/charts/:/charts - /data/downloads/k8s/charts/:/charts
    environment: environment:
    - TGZ_TARGET=harbor-v2.1.1.tgz - TGZ_TARGET=harbor-v2.1.3.tgz
    commands: commands:
    - rm -rf .git - rm -rf .git
    - tar -zcvf $TGZ_TARGET . - tar -zcvf $TGZ_TARGET .
    ...@@ -38,7 +38,7 @@ pipeline: ...@@ -38,7 +38,7 @@ pipeline:
    --extra-vars --extra-vars
    '{ '{
    "TARGET_ARCH":"amd64", "TARGET_ARCH":"amd64",
    "TARGET_VERSION":"v2.1.1" "TARGET_VERSION":"v2.1.3"
    }' }'
    --extra-vars "@images.yaml" --extra-vars "@images.yaml"
    when: when:
    ...@@ -58,7 +58,7 @@ pipeline: ...@@ -58,7 +58,7 @@ pipeline:
    --extra-vars --extra-vars
    '{ '{
    "TARGET_ARCH":"arm64", "TARGET_ARCH":"arm64",
    "TARGET_VERSION":"v2.1.1" "TARGET_VERSION":"v2.1.3"
    }' }'
    --extra-vars "@images.yaml" --extra-vars "@images.yaml"
    when: when:
    ...@@ -78,7 +78,7 @@ pipeline: ...@@ -78,7 +78,7 @@ pipeline:
    --extra-vars --extra-vars
    '{ '{
    "TARGET_ARCH":"ppc64le", "TARGET_ARCH":"ppc64le",
    "TARGET_VERSION":"v2.1.1" "TARGET_VERSION":"v2.1.3"
    }' }'
    --extra-vars "@images.yaml" --extra-vars "@images.yaml"
    when: when:
    ......
    Deploy.md
    View file @ 1850c4cb
    ...@@ -9,8 +9,8 @@ kubectl create ns devops ...@@ -9,8 +9,8 @@ kubectl create ns devops
    helm install \ helm install \
    --namespace=devops \ --namespace=devops \
    harbor \ harbor \
    /etc/kubernetes/helm/harbor \ /etc/kubernetes/helm/beagle-harbor \
    -f /etc/kubernetes/helm/harbor/values-overrides.yaml -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml
    # uninstall # uninstall
    helm uninstall \ helm uninstall \
    ...@@ -21,15 +21,15 @@ harbor ...@@ -21,15 +21,15 @@ harbor
    helm upgrade \ helm upgrade \
    --namespace=devops \ --namespace=devops \
    harbor \ harbor \
    /etc/kubernetes/helm/harbor \ /etc/kubernetes/helm/beagle-harbor \
    -f /etc/kubernetes/helm/harbor/values-overrides.yaml -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml
    # template # template
    helm template \ helm template \
    --namespace=devops \ --namespace=devops \
    harbor \ harbor \
    /etc/kubernetes/helm/harbor \ /etc/kubernetes/helm/beagle-harbor \
    -f /etc/kubernetes/helm/harbor/values-overrides.yaml > /etc/kubernetes/helm/harbor/dist.yaml -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml
    ``` ```
    ## images x86_64 ## images x86_64
    ......
    ansible/images.yaml
    View file @ 1850c4cb
    IMAGES: IMAGES:
    - repo: harbor-portal - repo: harbor-portal
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-core - repo: harbor-core
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-jobservice - repo: harbor-jobservice
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-db - repo: harbor-db
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-registryctl - repo: harbor-registryctl
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-chartmuseum - repo: harbor-chartmuseum
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-clair - repo: harbor-clair
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-clair-adapter - repo: harbor-clair-adapter
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-trivy-adapter - repo: harbor-trivy-adapter
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-notary-server - repo: harbor-notary-server
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: harbor-notary-signer - repo: harbor-notary-signer
    tag: "v2.1.1" tag: "v2.1.3"
    - repo: registry - repo: registry
    tag: "2.7.1" tag: "2.7.1"
    - repo: redis - repo: redis
    ......
    templates/registry/registry-dpl.yaml
    View file @ 1850c4cb
    ...@@ -46,12 +46,12 @@ spec: ...@@ -46,12 +46,12 @@ spec:
    {{- end }} {{- end }}
    containers: containers:
    - name: registry - name: registry
    {{- if contains "/" .Values.registry.image.repository }} {{- if contains "/" .Values.registry.registry.image.repository }}
    image: "{{ .Values.registry.image.repository }}" image: "{{ .Values.registry.registry.image.repository }}"
    {{- else }} {{- else }}
    image: "{{ .Values.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.image.repository }}:{{ .Values.registry.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}" image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
    {{- end }} {{- end }}
    imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
    livenessProbe: livenessProbe:
    httpGet: httpGet:
    path: / path: /
    ...@@ -134,8 +134,12 @@ spec: ...@@ -134,8 +134,12 @@ spec:
    {{ include "harbor.caBundleVolumeMount" . | indent 8 }} {{ include "harbor.caBundleVolumeMount" . | indent 8 }}
    {{- end }} {{- end }}
    - name: registryctl - name: registryctl
    image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} {{- if contains "/" .Values.registry.controller.image.repository }}
    imagePullPolicy: {{ .Values.imagePullPolicy }} image: "{{ .Values.registry.controller.image.repository }}"
    {{- else }}
    image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
    {{- end }}
    imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
    livenessProbe: livenessProbe:
    httpGet: httpGet:
    path: /api/health path: /api/health
    ......
    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