diff --git a/.gitignore b/.gitignore index 548dc87547d3023214901622871c50041d6e6b75..0ddc3f16503f7d16269a701338733f0e9ee760d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ charts/* requirements.lock -beagle-*.tgz \ No newline at end of file +*.tgz \ No newline at end of file diff --git a/.helmignore b/.helmignore index 15c71f077902192ed6880af34b1ef7b1f7920dbd..a759c9f5f5183ec59016ec67501f9b1a67572579 100644 --- a/.helmignore +++ b/.helmignore @@ -9,4 +9,5 @@ raws/* CONTRIBUTING.md Deploy.md .github/* -values-operator.yaml \ No newline at end of file +values-operator.yaml +*.tgz \ No newline at end of file diff --git a/Chart.yaml b/Chart.yaml index 69600d3083b39d12362515d5cefc26d5211c547a..d9b27153adc78691e10f1934f1cb4ac77838cced 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: beagle-harbor -version: 2.1.6 +version: 2.1.7 appVersion: 2.1.6 description: An open source trusted cloud native registry that stores, signs, and scans content keywords: diff --git a/Deploy.md b/Deploy.md index fb3c42903d63ddbf8ce308f33f8893a1092cc23a..8c3af9aad7cfc43b7ba8f0432ef44cf439757f0a 100644 --- a/Deploy.md +++ b/Deploy.md @@ -3,56 +3,34 @@ ## install ```bash -# 1.install -kubectl create ns devops - -helm install \ ---namespace=devops \ -harbor \ -/etc/kubernetes/helm/beagle-harbor \ --f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml - -# uninstall -helm uninstall \ ---namespace=devops \ -harbor - -# update -helm upgrade \ ---namespace=devops \ -harbor \ -/etc/kubernetes/helm/beagle-harbor \ --f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml - -# template -helm template \ ---namespace=devops \ -harbor \ -/etc/kubernetes/helm/beagle-harbor \ --f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml - -# 5. Package ## 打包项目 helm package . ## 部署项目 helm install \ harbor \ -/etc/kubernetes/charts/beagle-harbor-2.1.6.tgz \ ---namespace devops \ +/etc/kubernetes/charts/beagle-harbor-2.1.7.tgz \ +--namespace beagle-devops \ -f /etc/kubernetes/charts/beagle-harbor.yaml ## 更新项目 helm upgrade \ harbor \ -/etc/kubernetes/charts/beagle-harbor-2.1.6.tgz \ ---namespace devops \ +/etc/kubernetes/charts/beagle-harbor-2.1.7.tgz \ +--namespace beagle-devops \ -f /etc/kubernetes/charts/beagle-harbor.yaml ## 删除项目 helm uninstall \ ---namespace devops \ +--namespace beagle-devops \ harbor + +## 测试项目 +helm template \ +--namespace beagle-devops \ +harbor \ +/etc/kubernetes/helm/beagle-harbor \ +-f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml ``` ## images x86_64 diff --git a/raws/values.yaml b/raws/values.yaml index e6b9fa1e297e479b77d0249cb8bdc6704023efdc..826451826e38097b37fa452cbbf86278c390d028 100644 --- a/raws/values.yaml +++ b/raws/values.yaml @@ -415,7 +415,7 @@ core: replicas: 1 ## Startup probe values startupProbe: - enabled: true + enabled: false initialDelaySeconds: 10 # resources: # requests: diff --git a/values.yaml b/values.yaml index 0d361b9bd7bdd23dfed429cbf85d1c2f372410f4..487ccd31d6a60775832b81758dc933d7043b75f1 100644 --- a/values.yaml +++ b/values.yaml @@ -415,7 +415,7 @@ core: replicas: 1 ## Startup probe values startupProbe: - enabled: true + enabled: false initialDelaySeconds: 10 # resources: # requests: