Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Mizu
Commits
6bab3812
Unverified
Commit
6bab3812
authored
3 years ago
by
gadotroee
Committed by
GitHub
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Make kratos image configurable (#670)
parent
27dee4e0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
cli/cmd/installRunner.go
+1
-0
cli/cmd/installRunner.go
cli/config/configStruct.go
+2
-0
cli/config/configStruct.go
cli/resources/createResources.go
+3
-1
cli/resources/createResources.go
shared/consts.go
+1
-0
shared/consts.go
shared/kubernetes/provider.go
+3
-1
shared/kubernetes/provider.go
with
10 additions
and
2 deletions
+10
-2
cli/cmd/installRunner.go
+
1
-
0
View file @
6bab3812
...
...
@@ -47,6 +47,7 @@ func runMizuInstall() {
if
err
=
resources
.
CreateInstallMizuResources
(
ctx
,
kubernetesProvider
,
serializedValidationRules
,
serializedContract
,
serializedMizuConfig
,
config
.
Config
.
IsNsRestrictedMode
(),
config
.
Config
.
MizuResourcesNamespace
,
config
.
Config
.
AgentImage
,
config
.
Config
.
BasenineImage
,
config
.
Config
.
KratosImage
,
nil
,
defaultMaxEntriesDBSizeBytes
,
defaultResources
,
config
.
Config
.
ImagePullPolicy
(),
config
.
Config
.
LogLevel
(),
false
);
err
!=
nil
{
var
statusError
*
k8serrors
.
StatusError
...
...
This diff is collapsed.
Click to expand it.
cli/config/configStruct.go
+
2
-
0
View file @
6bab3812
...
...
@@ -28,6 +28,7 @@ type ConfigStruct struct {
Config
configStructs
.
ConfigConfig
`yaml:"config,omitempty"`
AgentImage
string
`yaml:"agent-image,omitempty" readonly:""`
BasenineImage
string
`yaml:"basenine-image,omitempty" readonly:""`
KratosImage
string
`yaml:"kratos-image,omitempty" readonly:""`
ImagePullPolicyStr
string
`yaml:"image-pull-policy" default:"Always"`
MizuResourcesNamespace
string
`yaml:"mizu-resources-namespace" default:"mizu"`
Telemetry
bool
`yaml:"telemetry" default:"true"`
...
...
@@ -50,6 +51,7 @@ func (config *ConfigStruct) validate() error {
func
(
config
*
ConfigStruct
)
SetDefaults
()
{
config
.
BasenineImage
=
fmt
.
Sprintf
(
"%s:%s"
,
shared
.
BasenineImageRepo
,
shared
.
BasenineImageTag
)
config
.
KratosImage
=
shared
.
KratosImageDefault
config
.
AgentImage
=
fmt
.
Sprintf
(
"gcr.io/up9-docker-hub/mizu/%s:%s"
,
mizu
.
Branch
,
mizu
.
SemVer
)
config
.
ConfigFilePath
=
path
.
Join
(
mizu
.
GetMizuFolderPath
(),
"config.yaml"
)
}
...
...
This diff is collapsed.
Click to expand it.
cli/resources/createResources.go
+
3
-
1
View file @
6bab3812
...
...
@@ -43,6 +43,7 @@ func CreateTapMizuResources(ctx context.Context, kubernetesProvider *kubernetes.
PodName
:
kubernetes
.
ApiServerPodName
,
PodImage
:
agentImage
,
BasenineImage
:
basenineImage
,
KratosImage
:
""
,
ServiceAccountName
:
serviceAccountName
,
IsNamespaceRestricted
:
isNsRestrictedMode
,
SyncEntriesConfig
:
syncEntriesConfig
,
...
...
@@ -66,7 +67,7 @@ func CreateTapMizuResources(ctx context.Context, kubernetesProvider *kubernetes.
return
mizuServiceAccountExists
,
nil
}
func
CreateInstallMizuResources
(
ctx
context
.
Context
,
kubernetesProvider
*
kubernetes
.
Provider
,
serializedValidationRules
string
,
serializedContract
string
,
serializedMizuConfig
string
,
isNsRestrictedMode
bool
,
mizuResourcesNamespace
string
,
agentImage
string
,
basenineImage
string
,
syncEntriesConfig
*
shared
.
SyncEntriesConfig
,
maxEntriesDBSizeBytes
int64
,
apiServerResources
shared
.
Resources
,
imagePullPolicy
core
.
PullPolicy
,
logLevel
logging
.
Level
,
noPersistentVolumeClaim
bool
)
error
{
func
CreateInstallMizuResources
(
ctx
context
.
Context
,
kubernetesProvider
*
kubernetes
.
Provider
,
serializedValidationRules
string
,
serializedContract
string
,
serializedMizuConfig
string
,
isNsRestrictedMode
bool
,
mizuResourcesNamespace
string
,
agentImage
string
,
basenineImage
string
,
kratosImage
string
,
syncEntriesConfig
*
shared
.
SyncEntriesConfig
,
maxEntriesDBSizeBytes
int64
,
apiServerResources
shared
.
Resources
,
imagePullPolicy
core
.
PullPolicy
,
logLevel
logging
.
Level
,
noPersistentVolumeClaim
bool
)
error
{
if
err
:=
createMizuNamespace
(
ctx
,
kubernetesProvider
,
mizuResourcesNamespace
);
err
!=
nil
{
return
err
}
...
...
@@ -97,6 +98,7 @@ func CreateInstallMizuResources(ctx context.Context, kubernetesProvider *kuberne
PodName
:
kubernetes
.
ApiServerPodName
,
PodImage
:
agentImage
,
BasenineImage
:
basenineImage
,
KratosImage
:
kratosImage
,
ServiceAccountName
:
serviceAccountName
,
IsNamespaceRestricted
:
isNsRestrictedMode
,
SyncEntriesConfig
:
syncEntriesConfig
,
...
...
This diff is collapsed.
Click to expand it.
shared/consts.go
+
1
-
0
View file @
6bab3812
...
...
@@ -18,4 +18,5 @@ const (
BaseninePort
=
"9099"
BasenineImageRepo
=
"ghcr.io/up9inc/basenine"
BasenineImageTag
=
"v0.3.0"
KratosImageDefault
=
"gcr.io/up9-docker-hub/mizu-kratos/stable:0.0.0"
)
This diff is collapsed.
Click to expand it.
shared/kubernetes/provider.go
+
3
-
1
View file @
6bab3812
...
...
@@ -178,6 +178,7 @@ type ApiServerOptions struct {
PodName
string
PodImage
string
BasenineImage
string
KratosImage
string
ServiceAccountName
string
IsNamespaceRestricted
bool
SyncEntriesConfig
*
shared
.
SyncEntriesConfig
...
...
@@ -185,6 +186,7 @@ type ApiServerOptions struct {
Resources
shared
.
Resources
ImagePullPolicy
core
.
PullPolicy
LogLevel
logging
.
Level
}
func
(
provider
*
Provider
)
GetMizuApiServerPodObject
(
opts
*
ApiServerOptions
,
mountVolumeClaim
bool
,
volumeClaimName
string
,
createAuthContainer
bool
)
(
*
core
.
Pod
,
error
)
{
...
...
@@ -314,7 +316,7 @@ func (provider *Provider) GetMizuApiServerPodObject(opts *ApiServerOptions, moun
if
createAuthContainer
{
containers
=
append
(
containers
,
core
.
Container
{
Name
:
"kratos"
,
Image
:
"gcr.io/up9-docker-hub/mizu-kratos/stable:0.0.0"
,
Image
:
opts
.
KratosImage
,
ImagePullPolicy
:
opts
.
ImagePullPolicy
,
VolumeMounts
:
volumeMounts
,
ReadinessProbe
:
&
core
.
Probe
{
...
...
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