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

Do not hardcode cluster.local #3679

Merged
merged 2 commits into from
Jan 24, 2022
Merged

Do not hardcode cluster.local #3679

merged 2 commits into from
Jan 24, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

  • Remove cluster.local suffix from Loki datasources (as it's not needed)
  • Do not hardcode cluster.local instead use the default variable define at one place
$ git grep -F "cluster.local" ':(exclude)charts/' ':(exclude)docs/developer'
salt/metalk8s/defaults.yaml:  cluster_domain: cluster.local

@TeddyAndrieux TeddyAndrieux requested a review from a team January 24, 2022 08:11
@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
salt: Remove cluster.local from Loki datasource
2c8818f 
`cluster.local` is a configurable domain, so remove it from Loki
datasource since it's not needed as Grafana run inside the cluster
@TeddyAndrieux
salt: Do no longer hardcode cluster.local everywhere
64e9594 
We need to set the `cluster.local` in some places, like certificates
SANs, so instead of hardcoding `cluster.local` we use the variable
defined in the `defaults.yaml` file
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/do-not-hardcode-clusterlocal branch from b028a72 to 64e9594 Compare January 24, 2022 08:12
@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

History mismatch

Merge commit #8d319848301a2bb9515059d8b0f5e2ac3315b59d on the integration branch
w/123.0/improvement/do-not-hardcode-clusterlocal is merging a branch which is neither the current
branch improvement/do-not-hardcode-clusterlocal nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/do-not-hardcode-clusterlocal and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 24, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit ad4f972 into development/2.11 Jan 24, 2022
@bert-e bert-e deleted the improvement/do-not-hardcode-clusterlocal branch January 24, 2022 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandre-allard alexandre-allard alexandre-allard approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @alexandre-allard