feat: added label and annotation for git credentials secret #162
Conversation
This file contains 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
Signed-off-by: xbaran4 <pbaran@redhat.com>
|
Can one of the admins verify this patch? |
Signed-off-by: xbaran4 <pbaran@redhat.com>
xbaran4
requested review from
amisevsk,
metlos,
nickboldt,
skabashnyuk and
sleshchenko
as code owners
amisevsk
approved these changes
Oct 18, 2021
sparkoo
reviewed
Oct 19, 2021
| // Adding devworkspace label here and not in the default map, | ||
| // in case of a secret from previous version that does not have it | ||
| Map<String, String> labels = new HashMap<>(LABELS); | ||
| labels.put(LABEL_DEV_WORKSPACE_CREDENTIAL, "true"); |
There was a problem hiding this comment.
It's not clear to me, why we can't use the original LABELS map here. The (LABEL_DEV_WORKSPACE_CREDENTIAL, "true") looks like a constant, so why we can't add it in the LABELS directly?
There was a problem hiding this comment.
Because we use LABELS here
while searching for already existing git credential secret.
There might be this secret but does not have the DW label because it was created before this PR.
| @@ -124,11 +130,16 @@ public void createOrReplace(PersonalAccessToken personalAccessToken) | |||
| annotations.put(ANNOTATION_SCM_URL, personalAccessToken.getScmProviderUrl()); | |||
| annotations.put(ANNOTATION_SCM_USERNAME, personalAccessToken.getScmUserName()); | |||
| annotations.put(ANNOTATION_CHE_USERID, personalAccessToken.getCheUserId()); | |||
| annotations.put(ANNOTATION_DEV_WORKSPACE_MOUNT_PATH, CREDENTIALS_MOUNT_PATH); | |||
There was a problem hiding this comment.
Can we add this directly into DEFAULT_SECRET_ANNOTATIONS map? Looks like a constant.
| private static final Map<String, String> LABELS = | ||
| ImmutableMap.of( | ||
| "app.kubernetes.io/part-of", "che.eclipse.org", | ||
| "app.kubernetes.io/component", "workspace-secret"); | ||
| "app.kubernetes.io/part-of", |
There was a problem hiding this comment.
can we keep old formatting? It's a map, so having key, value on same line looks better to me.
There was a problem hiding this comment.
Sure. I thought maven fmt would put it back for me :)
skabashnyuk
approved these changes
Oct 19, 2021
Signed-off-by: xbaran4 <pbaran@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: xbaran4 pbaran@redhat.com
What does this PR do?
Adds label and annotation for git credentails secret. These are then recognized by devworkspace controller to mount the credentials into the workspace.
Screenshot/screencast of this PR
What issues does this PR fix or reference?
eclipse-che/che#20432
How to test this PR?
quay.io/pbaran/che-server:factory-flowand devworkspaces enabledmake installfrom https://github.com/devfile/devworkspace-operator)annotation
controller.devfile.io/mount-path: /home/theia/.git-credentialslabel
controller.devfile.io/git-credential: "true"/home/theia/.git-credentials/credentialsPR Checklist
As the author of this Pull Request I made sure that:
What issues does this PR fix or referenceandHow to test this PRcompletedReviewers
Reviewers, please comment how you tested the PR when approving it.