Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change env var from BACKEND_ROUTE to BACKEND_URL #260

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Change env var from BACKEND_ROUTE to BACKEND_URL #260

merged 1 commit into from
Dec 20, 2023

Conversation

mayorova
Copy link
Contributor

@mayorova mayorova commented May 15, 2023 •
edited
Loading

Align SaaS operator with the changes in porta and 3scale operator:

The changes are:

  • add a new BACKEND_URL environment variable, while still keeping BACKEND_ROUTE to ensure smooth transition (to be deleted in future)
  • removed APICAST_BACKEND_ROOT_ENDPOINT environment variable, it is not in use by stg-saas or pro-saas environments.

@3scale-robot 3scale-robot added do-not-merge/work-in-progress needs-kind Indicates a PR or issue lacks a `kind/foo` label and requires one. needs-priority Indicates a PR or issue lacks a `priority/foo` label and requires one. labels May 15, 2023
@3scale-robot
Copy link
Contributor

Welcome @mayorova! It looks like this is your first PR to 3scale-ops/saas-operator 🎉

@3scale-robot 3scale-robot added needs-size Indicates a PR or issue lacks a `size/foo` label and requires one. size/XS Requires less than an hour to complete the PR or the issue. and removed needs-size Indicates a PR or issue lacks a `size/foo` label and requires one. labels May 15, 2023
@3scale-robot 3scale-robot requested review from raelga and roivaz May 15, 2023 14:10
mayorova
mayorova commented May 15, 2023
View reviewed changes
pkg/generators/system/config/options.go Outdated
@@ -123,8 +123,8 @@ func NewOptions(spec saasv1alpha1.SystemSpec) Options {
BackendRedisURL: &pod.ClearTextValue{Value: spec.Config.Backend.RedisDSN},
BackendRedisSentinelHosts: &pod.ClearTextValue{Value: ""},
BackendRedisSentinelRole: &pod.ClearTextValue{Value: ""},
ApicastBackendRootEndpoint: &pod.ClearTextValue{Value: spec.Config.Backend.InternalEndpoint},
BackendRoute: &pod.ClearTextValue{Value: spec.Config.Backend.InternalEndpoint},
ApicastBackendRootEndpoint: &pod.ClearTextValue{Value: spec.Config.Backend.ExternalEndpoint},
Copy link
Contributor Author

@mayorova mayorova May 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is OK, 3scale operator also points to the public endpoint (route). The change is, in fact, just to align, with on-prem 3scale operator.

The configs for SaaS do not use this env var, they rely on BACKEND_PUBLIC_URL instead.
(which means that maybe we could potentially drop APICAST_BACKEND_ROOT_ENDPOINT)

@mayorova mayorova force-pushed the feat/change-backend-url-env-var branch 2 times, most recently from 30aff45 to cf540a3 Compare December 19, 2023 13:03
@3scale-robot 3scale-robot added size/S Requires less than a day to complete the PR or the issue. and removed size/XS Requires less than an hour to complete the PR or the issue. labels Dec 19, 2023
@mayorova mayorova force-pushed the feat/change-backend-url-env-var branch 2 times, most recently from 8f4beac to 4bca9ea Compare December 19, 2023 13:05
@mayorova
Copy link
Contributor Author

/kind feature

@3scale-robot 3scale-robot added kind/feature Categorizes issue or PR as related to a new feature. and removed needs-kind Indicates a PR or issue lacks a `kind/foo` label and requires one. labels Dec 19, 2023
@mayorova mayorova force-pushed the feat/change-backend-url-env-var branch from 4bca9ea to 2d38373 Compare December 19, 2023 13:08
@mayorova mayorova marked this pull request as ready for review December 19, 2023 13:08
@3scale-robot 3scale-robot requested a review from slopezz December 19, 2023 13:08
@3scale-robot
Copy link
Contributor

@akostadinov: changing LGTM is restricted to collaborators

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@roivaz
Copy link
Member

roivaz commented Dec 20, 2023

/lgtm
/approve

@3scale-robot 3scale-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2023
@3scale-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3c2d0d76310b7b88b21a1889d45722567047f922

@3scale-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roivaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@3scale-robot 3scale-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 20, 2023
@3scale-robot 3scale-robot merged commit a4e36c9 into 3scale-ops:main Dec 20, 2023
3 checks passed
@mayorova mayorova deleted the feat/change-backend-url-env-var branch December 20, 2023 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akostadinov akostadinov akostadinov approved these changes

@raelga raelga Awaiting requested review from raelga

@roivaz roivaz Awaiting requested review from roivaz

@slopezz slopezz Awaiting requested review from slopezz

Assignees

@roivaz roivaz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. needs-priority Indicates a PR or issue lacks a `priority/foo` label and requires one. size/S Requires less than a day to complete the PR or the issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mayorova @3scale-robot @roivaz @akostadinov