Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
KubeOperator
Commits
6b13eafd
Commit
6b13eafd
authored
3 years ago
by
ssongliu
Browse files
Options
Download
Email Patches
Plain Diff
fix(tool): kubepi 升级
parent
69a1741a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
migration/100_add_kubepi_version.up.sql
+82
-0
migration/100_add_kubepi_version.up.sql
migration/99_update_kuberouter.up.sql
+1
-1
migration/99_update_kuberouter.up.sql
pkg/model/cluster.go
+1
-1
pkg/model/cluster.go
pkg/service/cluster/tools/kubepi.go
+1
-0
pkg/service/cluster/tools/kubepi.go
with
85 additions
and
2 deletions
+85
-2
migration/100_add_kubepi_version.up.sql
0 → 100644
+
82
-
0
View file @
6b13eafd
INSERT
INTO
`ko`
.
`ko_cluster_tool_detail`
(
`id`
,
`name`
,
`version`
,
`chart_version`
,
`architecture`
,
`describe`
,
`vars`
,
`created_at`
,
`updated_at`
)
VALUES
(
UUID
(),
'kubepi'
,
'v1.1.0'
,
'0.1.0'
,
'all'
,
NULL
,
'{
\"
kubepi_image_name
\"
:
\"
kubeoperator/kubepi-server
\"
,
\"
kubepi_image_tag
\"
:
\"
v1.1.0
\"
}'
,
date_add
(
now
(),
interval
8
HOUR
),
date_add
(
now
(),
interval
8
HOUR
)
);
UPDATE
`ko`
.
`ko_cluster_tool`
SET
`higher_version`
=
"v1.1.0"
WHERE
`name`
=
"kubepi"
AND
`status`
!=
"Waiting"
;
UPDATE
`ko`
.
`ko_cluster_tool`
SET
`version`
=
"v1.1.0"
WHERE
`name`
=
"kubepi"
AND
`status`
=
"Waiting"
;
UPDATE
ko_cluster_manifest
SET
`tool_vars`
=
'[{"name":"kubepi","version":"v1.1.0"},{"name":"loki","version":"v2.0.0"},{"name":"kubeapps","version":"v1.10.2"},{"name":"prometheus","version":"v2.18.1"},{"name":"chartmuseum","version":"v0.12.0"},{"name":"registry","version":"v2.7.1"},{"name":"grafana","version":"v7.3.3"},{"name":"logging","version":"v7.6.2"}]'
WHERE
`name`
in
(
'v1.18.4-ko1'
,
'v1.18.6-ko1'
,
'v1.18.8-ko1'
,
'v1.18.10-ko1'
,
'v1.18.12-ko1'
,
'v1.18.14-ko1'
);
UPDATE
ko_cluster_manifest
SET
`tool_vars`
=
'[{"name":"kubepi","version":"v1.1.0"},{"name":"loki","version":"v2.1.0"},{"name":"kubeapps","version":"v2.0.1"},{"name":"prometheus","version":"v2.20.1"},{"name":"chartmuseum","version":"v0.12.0"},{"name":"registry","version":"v2.7.1"},{"name":"grafana","version":"v7.3.3"},{"name":"logging","version":"v7.6.2"}]'
WHERE
`name`
in
(
'v1.18.15-ko1'
,
'v1.18.18-ko1'
,
'v1.18.20-ko1'
,
'v1.20.4-ko1'
,
'v1.20.6-ko1'
,
'v1.20.8-ko1'
,
'v1.20.10-ko1'
);
UPDATE
ko_cluster_manifest
set
storage_vars
=
'[{
\"
name
\"
:
\"
external-ceph
\"
,
\"
version
\"
:
\"
v2.1.1-k8s1.11
\"
}, {
\"
name
\"
:
\"
nfs
\"
,
\"
version
\"
:
\"
v3.1.0-k8s1.11
\"
}, {
\"
name
\"
:
\"
vsphere
\"
,
\"
version
\"
:
\"
v1.0.3
\"
}, {
\"
name
\"
:
\"
rook-ceph
\"
,
\"
version
\"
:
\"
v1.3.6
\"
}, {
\"
name
\"
:
\"
oceanstor
\"
,
\"
version
\"
:
\"
v2.2.9
\"
}, {
\"
name
\"
:
\"
cinder
\"
,
\"
version
\"
:
\"
v1.20.0
\"
}]'
WHERE
`name`
in
(
'v1.18.18-ko1'
,
'v1.18.20-ko1'
,
'v1.20.6-ko1'
,
'v1.20.8-ko1'
,
'v1.20.10-ko1'
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
migration/99_update_kuberouter.up.sql
+
1
-
1
View file @
6b13eafd
...
...
@@ -19,4 +19,4 @@ SET
LIMIT
1
)
)
\ No newline at end of file
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pkg/model/cluster.go
+
1
-
1
View file @
6b13eafd
...
...
@@ -258,7 +258,7 @@ func (c Cluster) PrepareTools() []ClusterTool {
return
[]
ClusterTool
{
{
Name
:
"kubepi"
,
Version
:
"v1.
0.1
"
,
Version
:
"v1.
1.0
"
,
Describe
:
"仪表盘|Dashboard"
,
Status
:
constant
.
ClusterWaiting
,
Logo
:
"kubepi.png"
,
...
...
This diff is collapsed.
Click to expand it.
pkg/service/cluster/tools/kubepi.go
+
1
-
0
View file @
6b13eafd
...
...
@@ -33,6 +33,7 @@ func (k KubePi) setDefaultValue(toolDetail model.ClusterToolDetail) {
_
=
json
.
Unmarshal
([]
byte
(
k
.
Tool
.
Vars
),
&
values
)
values
[
"image.repository"
]
=
fmt
.
Sprintf
(
"%s:%d/%s"
,
k
.
LocalHostName
,
k
.
LocalRepositoryPort
,
imageMap
[
"kubepi_image_name"
])
values
[
"image.tag"
]
=
imageMap
[
"kubepi_image_tag"
]
values
[
"securityContext.privileged"
]
=
true
str
,
_
:=
json
.
Marshal
(
&
values
)
k
.
Tool
.
Vars
=
string
(
str
)
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment