wmedvede commented on code in PR #3113:
URL:
https://github.com/apache/incubator-kie-tools/pull/3113#discussion_r2080164696
##########
packages/sonataflow-operator/config/default/manager_auth_proxy_patch.yaml:
##########
@@ -28,6 +28,9 @@ spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
+ env:
+ - name: RELATED_IMAGE_KUBE_RBAC_PROXY
Review Comment:
do the kube-rbac-proxy container get it' own name as en var?
##########
packages/sonataflow-operator/operator.yaml:
##########
@@ -28357,6 +28371,9 @@ spec:
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=0
+ env:
+ - name: RELATED_IMAGE_KUBE_RBAC_PROXY
Review Comment:
nitpick/question, do kube-rbca-proxy need to receive it own image name as
env?
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -112,3 +126,28 @@ func GetCfg() *ControllersCfg {
}
return controllersCfg
}
+
+// useEnvVarIfConfigEmpty overrides the image tags in case the YAML
configuration is empty or null with env vars injected into the pod by the OLM
Operator.
+func useEnvVarIfConfigEmpty(cfg *ControllersCfg) {
+ cfg.JobsServicePostgreSQLImageTag =
fallback(cfg.JobsServicePostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_PG"))
+ cfg.JobsServiceEphemeralImageTag =
fallback(cfg.JobsServiceEphemeralImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_EPHEMERAL"))
+ cfg.DataIndexPostgreSQLImageTag =
fallback(cfg.DataIndexPostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_DATA_INDEX_PG"))
Review Comment:
```suggestion
cfg.DataIndexPostgreSQLImageTag =
fallback(cfg.DataIndexPostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_DATA_INDEX_POSTGRESQL"))
```
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -42,7 +43,17 @@ var defaultControllersCfg = &ControllersCfg{
DefaultPvcKanikoSize: "1Gi",
KanikoDefaultWarmerImageTag: "gcr.io/kaniko-project/warmer:v1.9.0",
KanikoExecutorImageTag: "gcr.io/kaniko-project/executor:v1.9.0",
+ JobsServicePostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_PG", ""),
+ JobsServiceEphemeralImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_EPHEMERAL", ""),
+ DataIndexPostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_DATA_INDEX_PG", ""),
+ DataIndexEphemeralImageTag:
getEnvOrDefault("RELATED_IMAGE_DATA_INDEX_EPHEMERAL", ""),
+ DbMigratorToolImageTag:
getEnvOrDefault("RELATED_IMAGE_DB_MIGRATOR", ""),
+ SonataFlowBaseBuilderImageTag: getEnvOrDefault("RELATED_IMAGE_BUILDER",
""),
Review Comment:
```suggestion
SonataFlowBaseBuilderImageTag:
getEnvOrDefault("RELATED_IMAGE_BASE_BUILDER", ""),
```
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -42,7 +43,17 @@ var defaultControllersCfg = &ControllersCfg{
DefaultPvcKanikoSize: "1Gi",
KanikoDefaultWarmerImageTag: "gcr.io/kaniko-project/warmer:v1.9.0",
KanikoExecutorImageTag: "gcr.io/kaniko-project/executor:v1.9.0",
+ JobsServicePostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_PG", ""),
+ JobsServiceEphemeralImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_EPHEMERAL", ""),
+ DataIndexPostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_DATA_INDEX_PG", ""),
Review Comment:
```suggestion
DataIndexPostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_DATA_INDEX_POSTGRESQL", ""),
```
##########
packages/sonataflow-operator/env/index.js:
##########
@@ -74,6 +74,10 @@ module.exports = composeEnv([rootEnv,
sonataflowBuilderImageEnv, sonataflowDevMo
default:
`${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.registry}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.account}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.name}:${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.buildTag}`,
description: "Kogito DB Migrator image",
},
+ SONATAFLOW_OPERATOR_kubeProxyImage: {
Review Comment:
probalby not need since it's very internal, but this new declaration don't
have the corresponding entry
getEnvt() {
kubeProxyImage: getOrDefault(this.vars.SONATAFLOW_OPERATOR__kubeProxyImage)
}
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -112,3 +126,28 @@ func GetCfg() *ControllersCfg {
}
return controllersCfg
}
+
+// useEnvVarIfConfigEmpty overrides the image tags in case the YAML
configuration is empty or null with env vars injected into the pod by the OLM
Operator.
+func useEnvVarIfConfigEmpty(cfg *ControllersCfg) {
+ cfg.JobsServicePostgreSQLImageTag =
fallback(cfg.JobsServicePostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_PG"))
Review Comment:
```suggestion
cfg.JobsServicePostgreSQLImageTag =
fallback(cfg.JobsServicePostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_POSTGRESQL"))
```
##########
packages/sonataflow-operator/env/index.js:
##########
@@ -74,6 +74,10 @@ module.exports = composeEnv([rootEnv,
sonataflowBuilderImageEnv, sonataflowDevMo
default:
`${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.registry}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.account}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.name}:${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.buildTag}`,
description: "Kogito DB Migrator image",
},
+ SONATAFLOW_OPERATOR_kubeProxyImage: {
Review Comment:
```suggestion
SONATAFLOW_OPERATOR__kubeProxyImage: {
```
##########
packages/sonataflow-operator/env/index.js:
##########
@@ -74,6 +74,10 @@ module.exports = composeEnv([rootEnv,
sonataflowBuilderImageEnv, sonataflowDevMo
default:
`${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.registry}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.account}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.name}:${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.buildTag}`,
description: "Kogito DB Migrator image",
},
+ SONATAFLOW_OPERATOR_kubeProxyImage: {
Review Comment:
nitpick, sibling images in the index.js files has "__" , example:
SONATAFLOW_OPERATOR__kogitoDBMigratorToolImage
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -112,3 +126,28 @@ func GetCfg() *ControllersCfg {
}
return controllersCfg
}
+
+// useEnvVarIfConfigEmpty overrides the image tags in case the YAML
configuration is empty or null with env vars injected into the pod by the OLM
Operator.
+func useEnvVarIfConfigEmpty(cfg *ControllersCfg) {
+ cfg.JobsServicePostgreSQLImageTag =
fallback(cfg.JobsServicePostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_PG"))
+ cfg.JobsServiceEphemeralImageTag =
fallback(cfg.JobsServiceEphemeralImageTag,
os.Getenv("RELATED_IMAGE_JOBS_SERVICE_EPHEMERAL"))
+ cfg.DataIndexPostgreSQLImageTag =
fallback(cfg.DataIndexPostgreSQLImageTag,
os.Getenv("RELATED_IMAGE_DATA_INDEX_PG"))
+ cfg.DataIndexEphemeralImageTag =
fallback(cfg.DataIndexEphemeralImageTag,
os.Getenv("RELATED_IMAGE_DATA_INDEX_EPHEMERAL"))
+ cfg.DbMigratorToolImageTag = fallback(cfg.DbMigratorToolImageTag,
os.Getenv("RELATED_IMAGE_DB_MIGRATOR"))
+ cfg.SonataFlowBaseBuilderImageTag =
fallback(cfg.SonataFlowBaseBuilderImageTag, os.Getenv("RELATED_IMAGE_BUILDER"))
Review Comment:
```suggestion
cfg.SonataFlowBaseBuilderImageTag =
fallback(cfg.SonataFlowBaseBuilderImageTag,
os.Getenv("RELATED_IMAGE_BASE_BUILDER"))
```
##########
packages/sonataflow-operator/internal/controller/cfg/controllers_cfg.go:
##########
@@ -42,7 +43,17 @@ var defaultControllersCfg = &ControllersCfg{
DefaultPvcKanikoSize: "1Gi",
KanikoDefaultWarmerImageTag: "gcr.io/kaniko-project/warmer:v1.9.0",
KanikoExecutorImageTag: "gcr.io/kaniko-project/executor:v1.9.0",
+ JobsServicePostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_PG", ""),
Review Comment:
```suggestion
JobsServicePostgreSQLImageTag:
getEnvOrDefault("RELATED_IMAGE_JOBS_SERVICE_POSTGRESQL", ""),
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
