-
Notifications
You must be signed in to change notification settings - Fork 176
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.
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
chore: adjust env vars so that check-env-var-annotations passes #8574
Conversation
b4c192a
to
de36b0a
Compare
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.
From what I have read, this all looks ok to me 👍
Following issue found: There are envvars that have been added in 5.0 and are therefore not pre5.0
The list added in 5.0 can be found at https://owncloud.dev/services/general-info/env-var-deltas/4.0.0-5.0.0-added/
Needs (imho) backport to |
I am aware of that. My suggestion is that we can first merge this to get The exact env vars that are introduced in 5.0 is a bit complex, due to the lines that have multiple env vars. So that is taking more time to sort out. |
6cbdf62
to
11522bd
Compare
| services/auth-service/pkg/config/tracing.go | `OCIS_TRACING_ENABLED;AUTH_SERVICE_TRACING_ENABLED` | Activates tracing. | | | ||
| | `OCIS_TRACING_TYPE;AUTH_SERVICE_TRACING_TYPE` | The type of tracing. Defaults to '', which is the same as 'jaeger'. Allowed tracing types are 'jaeger' and '' as of now."` | | | ||
| | `OCIS_TRACING_ENDPOINT;AUTH_SERVICE_TRACING_ENDPOINT` | The endpoint of the tracing agent. | | | ||
| | `OCIS_TRACING_COLLECTOR;AUTH_SERVICE_TRACING_COLLECTOR` | The HTTP endpoint for sending spans directly to a collector, i.e. http://jaeger-collector:14268/api/traces. Only used if the tracing endpoint is unset. | | |
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.
Note: these env vars are actually in tracing.go
so I have adjusted the md file.
FYI @mmattel @dragonchaser
If I find other minor things in the md file, I will push those also.
Things I found: OCIS_CACHE_DISABLE_PERSISTENCE;GATEWAY_STAT_CACHE_DISABLE_PERSISTENCE not found |
| | `OCIS_CACHE_AUTH_USERNAME;SETTINGS_CACHE_AUTH_USERNAME` | The username to authenticate with the cache. Only applies when store type 'nats-js-kv' is configured. | | | ||
| | `OCIS_CACHE_AUTH_PASSWORD;SETTINGS_CACHE_AUTH_PASSWORD` | The password to authenticate with the cache. Only applies when store type 'nats-js-kv' is configured. | | |
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.
I think that these are the correct names - they exist in services/settings/pkg/config/config.go
@mmattel @dragonchaser all done - please look and comment about anything that I have missed or needs changing. |
63150d8
to
a2c4736
Compare
I will do that when this Pr to master is reviewed |
@phil-davis There was a conflict because #8523 got merged which I solved. That PR contained new envvars relevant for master and later 5.1 BUT... When doing a backport to
to
Else we get non 5.0 related content into the 5.0 branch. |
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.
@phil-davis Please merge & backport to stable-5.0
Plus see the backporting comments from @mmattel above.
as per suggestions by micbar Co-authored-by: Michael Barz <[email protected]>
46923b5
to
ae584af
Compare
Rebased - CI should pass now, and we can merge. |
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.
Looks good from a docs pov 👍
Quality Gate failedFailed conditions See analysis details on SonarCloud Catch issues before they fail your Quality Gate with our IDE extension SonarLint |
Now SonarCloud does not like the order of items in the yaml in
to have the items in alphabetical order. It complains about 43 lines in that one file, but does not complain about the same format in all the |
chore: adjust env vars so that check-env-var-annotations passes
Note: backported to stable-5.0 in PR #8583 |
Description
This sets
introductionVersion
to "pre5.0" everywhere as a start. I suggest that we merge this, so thatintroductionVersion
is defined everywhere, then I can separately work on removing "pre" for those env vars that are introduced in 5.0This supersedes PR #8469
Related Issue
Part of #8434
How Has This Been Tested?
https://drone.owncloud.com/owncloud/ocis/32623/1/6
Types of changes
Checklist: