Skip to content

Commit 1ca11c8

Browse files
committed
refactor: remove deprecated DevOps initialization options and references
- Remove deprecated configuration options related to skipping DevOps initialization from scripts and documentation. - Eliminate the variable for skipping DevOps initialization in the Meta struct. - Update function to remove checks and references for the deprecated skip DevOps initialization feature. Signed-off-by: ysicing <i@ysicing.me>
1 parent 17b12d3 commit 1ca11c8

3 files changed

Lines changed: 2 additions & 24 deletions

File tree

hack/scripts/devops/devops.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
# Install Version when install Zentao DevOPS.
2626
# Defaults to ''
2727
# - INSTALL_DOMAIN
28-
# If not set default use gen default domain
29-
# - SKIP_DEVOPS_INIT(Deprecated)
30-
# Allow skip devops init
31-
# Defaults to 'true'
3228
# - DEBUG
3329
# If set, print debug information
3430
# - STORAGE_TYPE
@@ -209,9 +205,6 @@ install_zentao_devops() {
209205
if [ -n "${DEVOPS_VERSION}" ]; then
210206
INSTALL_COMMAND="${INSTALL_COMMAND} --version ${DEVOPS_VERSION}"
211207
fi
212-
# if [ "${SKIP_DEVOPS_INIT}" = "false" ]; then
213-
# INSTALL_COMMAND="${INSTALL_COMMAND} --skip-devops-init false"
214-
# fi
215208
if [ "${STORAGE_TYPE}" = "nfs" ]; then
216209
INSTALL_COMMAND="${INSTALL_COMMAND} --storage nfs"
217210
fi

hack/scripts/devops/install.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
# Install Version when install Zentao DevOPS.
2626
# Defaults to ''
2727
# - INSTALL_DOMAIN
28-
# If not set default use gen default domain
29-
# - SKIP_DEVOPS_INIT(Deprecated)
30-
# Allow skip devops init
31-
# Defaults to 'true'
3228
# - DEBUG
3329
# If set, print debug information
3430
# - STORAGE_TYPE
@@ -221,9 +217,6 @@ install_zentao_devops() {
221217
if [ -n "${DEVOPS_VERSION}" ]; then
222218
INSTALL_COMMAND="${INSTALL_COMMAND} --version ${DEVOPS_VERSION}"
223219
fi
224-
# if [ "${SKIP_DEVOPS_INIT}" = "false" ]; then
225-
# INSTALL_COMMAND="${INSTALL_COMMAND} --skip-devops-init false"
226-
# fi
227220
if [ "${STORAGE_TYPE}" = "nfs" ]; then
228221
INSTALL_COMMAND="${INSTALL_COMMAND} --storage nfs"
229222
fi

pkg/quickon/quickon.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ type Meta struct {
4444
ConsolePassword string
4545
DevopsMode bool
4646
OffLine bool
47-
SkipDevOPSInit bool
4847
DBReplication bool
4948
ExtDBHost string
5049
ExtDBPort string
@@ -89,12 +88,6 @@ func (m *Meta) GetCustomFlags() []types.Flag {
8988
V: false,
9089
Hidden: true,
9190
},
92-
{
93-
Name: "skip-devops-init",
94-
Usage: "allow user skip devops init",
95-
P: &m.SkipDevOPSInit,
96-
V: true,
97-
},
9891
{
9992
Name: "db-replication",
10093
Usage: "db use replication mode, default standalone: false",
@@ -411,9 +404,8 @@ func (m *Meta) Init() error {
411404
helmargs = append(helmargs, "--set", "mysql.auth.host=zentaopaas-mysql.quickon-system.svc")
412405
}
413406

414-
if m.SkipDevOPSInit {
415-
helmargs = append(helmargs, "--set", "env.ZT_SKIP_DEVOPS_INIT=true")
416-
}
407+
// TODO: 等下个版本禅道正式发版后续删除
408+
helmargs = append(helmargs, "--set", "env.ZT_SKIP_DEVOPS_INIT=true")
417409

418410
if m.DBReplication {
419411
helmargs = append(helmargs, "--set", "mysql.replication.enabled=true")

0 commit comments

Comments
 (0)