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

Add GitLab to ecosystem page #1541

Merged
merged 1 commit into from
Sep 4, 2023
Merged

Add GitLab to ecosystem page #1541

merged 1 commit into from
Sep 4, 2023

Conversation

stefanprodan
Copy link
Member

Add GitLab to the ecosystem page and link to their Flux documentation.

@stefanprodan stefanprodan added the area/ecosystem Ecosystem related issues and pull requests label Jul 3, 2023
@stefanprodan stefanprodan added the hold Issues and pull requests put on hold label Jul 3, 2023
@stefanprodan
Copy link
Member Author

We need someone from GitLab to approve it.

@makkes
Copy link
Member

makkes commented Jul 3, 2023

We need someone from GitLab to approve it.

@timofurrer, would you mind taking a look at this change, please?

timofurrer
timofurrer suggested changes Jul 4, 2023
View reviewed changes
Copy link
Contributor

@timofurrer timofurrer left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@stefanprodan @makkes I've left a suggestion to fix a copy & paste error - otherwise LGTM from my side and it's great to see GitLab in the list, thanks 👍 .

However, before a merge I want to quickly get another approval from "management" - I'll be back for that. :)

content/en/ecosystem/index.md Outdated Show resolved Hide resolved
@timofurrer
Copy link
Contributor

I hope to be back with an approval asap. I need to follow https://about.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-strategy/#vendor-reference-requests from our side.

@stefanprodan
Copy link
Member Author

@timofurrer any news on this? Or should I close this PR?

@timofurrer
Copy link
Contributor

@stefanprodan now updates yet unfortunately. I'll keep you posted. 🙏

@nagyv
Copy link

nagyv commented Jul 26, 2023

@stefanprodan we got a question from legal: Do you know if Weaveworks is the entity requesting the rights? If you're not sure, then the team will need to reach out to your Flux contact to confirm which entity they're requesting to use the logo under.

@nagyv
Copy link

nagyv commented Jul 26, 2023

Adding the GitLab link here for easier tracking: https://gitlab.com/gitlab-com/marketing/corporate_marketing/corporate-marketing/-/issues/8172

The link is accessible to some people only. Typically GitLab team members.

@makkes
Copy link
Member

makkes commented Jul 26, 2023

@stefanprodan we got a question from legal: Do you know if Weaveworks is the entity requesting the rights? If you're not sure, then the team will need to reach out to your Flux contact to confirm which entity they're requesting to use the logo under.

This is for the Flux website at https://fluxcd.io/ecosystem/ so the legal entity would be the CNCF because Flux is a CNCF project.

@nagyv
Copy link

nagyv commented Jul 28, 2023

@makkes Do you have any CNCF legal contacts?

The GitLab legal team wrote:

Use of our logo for this purpose is not covered in the CNCF license, so we'll need a simple trademark license in place to add our logo to the FluxCD website. Please reach out to your contact to see if the CNCF has a preferred template that they can provide, as that may expedite this.

GitLab can prepare the text too, but we'll still need someone to sign it from the CNCF.

@makkes
Copy link
Member

makkes commented Jul 28, 2023

@makkes Do you have any CNCF legal contacts?

The GitLab legal team wrote:

Use of our logo for this purpose is not covered in the CNCF license, so we'll need a simple trademark license in place to add our logo to the FluxCD website. Please reach out to your contact to see if the CNCF has a preferred template that they can provide, as that may expedite this.

GitLab can prepare the text too, but we'll still need someone to sign it from the CNCF.

Hmm, not sure about this. Maybe @caniszczyk can help here?

@hiddeco
Copy link
Member

hiddeco commented Aug 2, 2023

Chris receives many notifications, likely best to put in a request with the Service Desk.

@caniszczyk
Copy link
Collaborator

caniszczyk commented Aug 2, 2023 via email

@makkes
Copy link
Member

makkes commented Aug 2, 2023

I will open a service desk ticket as soon as I got access to the portal (asked for it a minute ago).

I guess we can wait some more time until we change the direction of this PR to possibly only include the name and not the logo (not sure if this changes anything from GitLab's perspective. @nagyv?).

@stefanprodan
Copy link
Member Author

This change is about showing the logo.

@makkes
Copy link
Member

makkes commented Aug 2, 2023

I filed a request with CNCF Legal: https://cncfservicedesk.atlassian.net/servicedesk/customer/portal/1/CNCFSD-1886 (the request is only accessible to Flux maintainers).

@makkes
Copy link
Member

makkes commented Aug 3, 2023

@nagyv CNCF responded:

can you put us in touch with the gitlab lawyer so we can see what they want CNCF to sign, I think we can remedy this w/o any formal legal agreement here but I need to get some details first

Would you mind providing a point of contact that I can share with CNCF for them to figure things out, please? You can share it privately with me on Slack if you prefer.

@nagyv
Copy link

nagyv commented Aug 22, 2023

The lawyers are e-mailiing. There was a question where would the GitLab logo link to. I expect it to link to https://docs.gitlab.com/ee/user/clusters/agent/gitops.html

Please, correct me if I'm wrong.

@stefanprodan
Add GitLab to ecosystem page
22dae3a 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
@stefanprodan
Copy link
Member Author

I expect it to link to https://docs.gitlab.com/ee/user/clusters/agent/gitops.html

@nagyv I've updated the link. Thanks!

@makkes
Copy link
Member

makkes commented Aug 22, 2023

The lawyers are e-mailiing. There was a question where would the GitLab logo link to. I expect it to link to https://docs.gitlab.com/ee/user/clusters/agent/gitops.html

That is correct.

@amye
Copy link

amye commented Sep 1, 2023

Solved!
Here's the limitations:
Only the Logomark in GitLab’s press kit may be used. Any use of GitLab’s marks must follow GitLab’s Design Guidelines and Trademark Guidelines.
They'll reach out to trademarks@linuxfoundation.org if they need to change anything.

@makkes
Copy link
Member

makkes commented Sep 1, 2023

Thank you @amye! So I assume we can merge this PR and if there's anything we should change we will issue another PR. /cc @timofurrer

@stefanprodan stefanprodan removed the hold Issues and pull requests put on hold label Sep 2, 2023
@stefanprodan
Copy link
Member Author

We're using the Logomark from GitLab’s press kit. Thanks everyone for getting this approved.

@stefanprodan stefanprodan merged commit 0a53f37 into main Sep 4, 2023
5 checks passed
@stefanprodan stefanprodan deleted the gitlab-ecosystem branch September 4, 2023 09:03
@nagyv
Copy link

nagyv commented Sep 4, 2023

Thank you @stefanprodan and @makkes for you patience!

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

@timofurrer timofurrer timofurrer requested changes

@makkes makkes makkes approved these changes

Assignees
No one assigned
Labels
area/ecosystem Ecosystem related issues and pull requests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@stefanprodan @makkes @timofurrer @nagyv @hiddeco @caniszczyk @amye