From 30e5e8d037df655e3c54991203ac66ca6b12eb96 Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Thu, 31 Mar 2022 22:43:03 +0800
Subject: [PATCH] 2.1.7

---
 .gitignore       |  2 +-
 .helmignore      |  3 ++-
 Chart.yaml       |  2 +-
 Deploy.md        | 46 ++++++++++++----------------------------------
 raws/values.yaml |  2 +-
 values.yaml      |  2 +-
 6 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 548dc87..0ddc3f1 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 15c71f0..a759c9f 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 69600d3..d9b2715 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 fb3c429..8c3af9a 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 e6b9fa1..8264518 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 0d361b9..487ccd3 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:
-- 
2.26.0