[openfga] Configure CloudSQL datastore #15703
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,75 +28,10 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { | |
| return nil, nil | ||
| } | ||
|
|
||
| var containers []corev1.Container | ||
|
|
||
| var volumes []corev1.Volume | ||
| var openfgaEnvVars []corev1.EnvVar | ||
|
|
||
| if cfg.CloudSQL != nil { | ||
| containers = append(containers, corev1.Container{ | ||
|
|
@@ -137,8 +72,108 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { | |
| }}, | ||
| }, | ||
| }...) | ||
|
|
||
| // We use our cloud-sql-proxy sidecar to target the DB. | ||
| dbHost := "localhost" | ||
| openfgaEnvVars = append(openfgaEnvVars, []corev1.EnvVar{ | ||
| { | ||
| Name: "OPENFGA_DATASTORE_ENGINE", | ||
| Value: "mysql", | ||
| }, | ||
| { | ||
| Name: "DB_PASSWORD", | ||
| ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{ | ||
| LocalObjectReference: corev1.LocalObjectReference{ | ||
| Name: cfg.CloudSQL.DatabaseSecretRef, | ||
| }, | ||
| Key: "password", | ||
|
There was a problem hiding this comment. How will the real username and password be provided to the env var? There was a problem hiding this comment. Through a k8s secret, which has been added in this PR https://github.com/gitpod-io/ops/pull/7712 TF loads the secret from GCP into k8s, we reference it through the |
||
| }}, | ||
| }, | ||
| { | ||
| Name: "DB_USERNAME", | ||
| ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{ | ||
| LocalObjectReference: corev1.LocalObjectReference{ | ||
| Name: cfg.CloudSQL.DatabaseSecretRef, | ||
| }, | ||
| Key: "user", | ||
| }}, | ||
| }, | ||
| { | ||
| Name: "OPENFGA_DATASTORE_URI", | ||
| Value: fmt.Sprintf("$(DB_USERNAME):$(DB_PASSWORD)@tcp(%s:%d)/%s?parseTime=true", dbHost, CloudSQLProxyPort, cfg.CloudSQL.Instance), | ||
| }, | ||
| }...) | ||
| } | ||
|
Comment on lines
+78
to
+106
There was a problem hiding this comment. This is the core of this PRs change, rest are moves to satisfy declaration dependencies. |
||
|
|
||
| openfgaContainer := corev1.Container{ | ||
| Name: ContainerName, | ||
| Image: ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), RegistryImage, ImageTag), | ||
| ImagePullPolicy: corev1.PullIfNotPresent, | ||
| Args: []string{ | ||
| "run", | ||
| "--log-format=json", | ||
| "--log-level=warn", | ||
| }, | ||
| Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv( | ||
| common.DefaultEnv(&ctx.Config), | ||
| openfgaEnvVars, | ||
| )), | ||
| Ports: []corev1.ContainerPort{ | ||
| { | ||
| ContainerPort: ContainerGRPCPort, | ||
| Name: ContainerGRPCName, | ||
| Protocol: *common.TCPProtocol, | ||
| }, | ||
| { | ||
| ContainerPort: ContainerHTTPPort, | ||
| Name: ContainerHTTPName, | ||
| Protocol: *common.TCPProtocol, | ||
| }, | ||
| { | ||
| ContainerPort: ContainerPlaygroundPort, | ||
| Name: ContainerPlaygroundName, | ||
| Protocol: *common.TCPProtocol, | ||
| }, | ||
| }, | ||
| Resources: common.ResourceRequirements(ctx, Component, ContainerName, corev1.ResourceRequirements{ | ||
| Requests: corev1.ResourceList{ | ||
| "cpu": resource.MustParse("1m"), | ||
| "memory": resource.MustParse("30Mi"), | ||
| }, | ||
| }), | ||
| SecurityContext: &corev1.SecurityContext{ | ||
| RunAsGroup: pointer.Int64(65532), | ||
| RunAsNonRoot: pointer.Bool(true), | ||
| RunAsUser: pointer.Int64(65532), | ||
| }, | ||
| LivenessProbe: &corev1.Probe{ | ||
| ProbeHandler: corev1.ProbeHandler{ | ||
| HTTPGet: &corev1.HTTPGetAction{ | ||
| Path: "/healthz", | ||
| Port: intstr.IntOrString{IntVal: ContainerHTTPPort}, | ||
| Scheme: corev1.URISchemeHTTP, | ||
| }, | ||
| }, | ||
| FailureThreshold: 3, | ||
| SuccessThreshold: 1, | ||
| TimeoutSeconds: 1, | ||
| }, | ||
| ReadinessProbe: &corev1.Probe{ | ||
| ProbeHandler: corev1.ProbeHandler{ | ||
| HTTPGet: &corev1.HTTPGetAction{ | ||
| Path: "/healthz", | ||
| Port: intstr.IntOrString{IntVal: ContainerHTTPPort}, | ||
| Scheme: corev1.URISchemeHTTP, | ||
| }, | ||
| }, | ||
| FailureThreshold: 3, | ||
| SuccessThreshold: 1, | ||
| TimeoutSeconds: 1, | ||
| }, | ||
| } | ||
|
|
||
| containers = append(containers, openfgaContainer) | ||
|
|
||
| return []runtime.Object{ | ||
| &appsv1.Deployment{ | ||
| TypeMeta: common.TypeMetaDeployment, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The definition is moved below. If there's config for CloudSQL, we configure the sidecar first and based on that we inject extra envs to the openfga application.