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.

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

Adjust fluentd names and app labels #573

Merged
merged 2 commits into from
Apr 9, 2020
Merged

Conversation

perk-sumo
Copy link
Contributor

Description

Fill in your description here.

Testing performed
  • ci/build.sh
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

@perk-sumo perk-sumo force-pushed the perk-app-labels-cleanup branch 3 times, most recently from 24fa00c to 8c54065 Compare April 8, 2020 11:57
@@ -3,11 +3,11 @@ kind: Service
metadata:
name: {{ template "sumologic.fullname" . }}-fluentd-headless
labels:
app: {{ template "sumologic.labels.app" . }}
app: {{ printf "%s-fluentd-headless" (include "sumologic.labels.app" .) }}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should stick to the templates :)
We could create templates for events, fluentd, otelcol and whatever else we have. for both names and labels

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good point but let's do it in 1.1 and not change the 1.0 scope any further.
I've created an issue to keep track of that one: #574

@perk-sumo perk-sumo changed the title Clean up names and app labels Adjust fluentd names and app labels Apr 8, 2020
@perk-sumo perk-sumo marked this pull request as ready for review April 8, 2020 16:34
@samjsong
Copy link
Contributor

samjsong commented Apr 8, 2020

There's a few other places that we use collection-sumologic, for example ServiceAccount, ClusterRole, ClusterRoleBinding
Will we want/need to change these as well? Some of these also reference a label app=collection-sumologic

@perk-sumo
Copy link
Contributor Author

perk-sumo commented Apr 8, 2020

Actually that's a very good question @samjsong !
Firstly I've created a massive PR with all of those places refactored.
But then, when I looked at how many things I needed to change and saw that I was still not happy with the outcome I was not so sure we'd like to change all of that just before the release.
I propose we do the smallest subset that makes sense for now and do a big refactor for 1.1 (including the #574 )

Copy link
Contributor

@vsinghal13 vsinghal13 left a comment

Choose a reason for hiding this comment

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

LGTM, with the remaining changes to be done in 1.1

@perk-sumo perk-sumo added this to the v1.0 milestone Apr 8, 2020
@samjsong
Copy link
Contributor

samjsong commented Apr 8, 2020

Hmm, I'm afraid changing the names of those other resources might technically be a breaking change for non-helm users since we'd be leaving old resources behind. The user would have to manually delete the old ServiceAccount etc since kubectl apply has no concept of deletion

but I don't believe it'll have any impact in terms of functionality, just some leftover resources... if this is okay then I'm +1 and we can proceed with this plan

@perk-sumo
Copy link
Contributor Author

perk-sumo commented Apr 8, 2020

Actually ServiceAccount is being used by fluentd, events and otelcol. So I think we should leave it as it is. That being said I've updated labels for HPA and ConfigMap as well, please find the second commit.

Copy link
Contributor

@samjsong samjsong left a comment

Choose a reason for hiding this comment

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

Thanks Perk!

@perk-sumo perk-sumo merged commit b6770e8 into master Apr 9, 2020
@perk-sumo perk-sumo deleted the perk-app-labels-cleanup branch April 9, 2020 07:45
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.

4 participants