Skip to content

Conversation

@ChrsMark
Copy link
Member

Cherry-pick of PR #16554 to 7.6 branch. Original message:

Follow-up of #16480 PR.

It was found also that kubernetes.annotations.* do not follow the schema defined at

any more.

This PR aims to fix it.

Not sure if we should fix it in general for all resources at

safemapstr.Put(meta, strings.ToLower(kind)+".annotations", annotationsMap)
and not only for pods. I think we should do it sooner or later when we define a general strategy about this schema as mentioned #16480 (comment).

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good, other then the fix in the changelog.


- Fix k8s pods labels broken schema. {pull}16480[16480]
- Fix k8s pods annotations broken schema. {pull}16554[16554]
- Upgrade go-ucfg to latest v0.8.3. {pull}16450{16450}
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not from this PR.

@ChrsMark ChrsMark closed this Feb 25, 2020
@ChrsMark ChrsMark deleted the backport_16554_7.6 branch February 25, 2020 21:42
@kovyrin
Copy link
Contributor

kovyrin commented Feb 25, 2020

Did we close this unmerged (and what does it mean for the 7.6.1)?

@ChrsMark
Copy link
Member Author

Hey there were some issues with GH and backporting script was not working properly so I rerun the script. Here is the safe one: #16581

Sorry for the inconvenience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants