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

Services / Replicas #51

Merged
merged 10 commits into from Oct 3, 2019
Merged

Services / Replicas #51

merged 10 commits into from Oct 3, 2019

Conversation

gambol99
Copy link
Contributor

@gambol99 gambol99 commented Sep 20, 2019

  • adding the ability to easily override the org (used for testing)
  • adding the prometheus scrape annotations
  • adding the liveness and readiness probes to the deployment
  • adding the ability to controller the labels and annotations on the service and ingress which is useful for addon components or clouds specifics (cert-manaer, gke ingress, eks etc)
  • adding the ability to support multiple replicas
  • using a hash tag rather than an pods restart to roll the deployments

Apologizes for bundling these in a single PR I was making changes, deploying and testing at the same time. I've separated changes into individual commits, but if you prefer and try make each a PR

- adding the ability to easily override the org (used for testing)
- adding the ability to controller the labels and annotations on the service and ingress which is useful for addon components or clouds specifics (cert-manaer, gke ingress, eks etc)
- adding the ability to support multiple replicas
- using a hash tag rather than an pods restart to roll the deployments
@pb82
Copy link
Collaborator

pb82 commented Sep 20, 2019

@gambol99 That looks awesome, thanks for the contribution! I'd like to get this reviewed and tested as soon as possible. I'll see if i get a chance next week.

adding the ability to controller the labels and annotations on the service and ingress which is useful for addon components or clouds specifics (cert-manaer, gke ingress, eks etc)

I think this would deprecate the pod-label-value flag and we could add the same labels to the pod as well?

common.GrafanaDatasourcesConfigMapName,
common.GrafanaServiceName,
}
if cr.Spec.Hostname != "" {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why only create the Ingress/Route when a Hostname is set? Its not a requirement for OpenShift Routes (gets assigned automatically if not provided) and i believe in vanilla Kubernetes this is valid too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hi @pb82 ... I guess the thinking was to provide a means to control if you wanted a ingress, or defer to a LoadBalancer svc. I was gonna fold this into a spec.ingress.enabled option but wanted to keep it compatible with previous versions. If you prefer though, I'll drop the change and keep the ingress as is?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Making the Ingress/Route optional sounds ok to me. So is your idea to replace this with the ingressEnabled flag? What do you think about providing a spec.ingressSettings struct with two options: enabled and hostname? This would be used for routes as well and the default option is enabled with no hostname set.

At some point we would have to deprecate the old hostname option, but i can take care of that.

imagePullPolicy: IfNotPresent
name: grafana
env:
- name: CONFIG_HASH
Copy link
Collaborator

Choose a reason for hiding this comment

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

I like this, much better solution for restarts 👍

gambol99 and others added 3 commits September 23, 2019 11:10
- Switching to using a map[string]string instead of the metav1.LabelSelector as it's makes more sense
@pb82
Copy link
Collaborator

pb82 commented Sep 29, 2019

@gambol99 I think this looks good overall. I've created a PR against your branch that updates the docs, CRDs and adds spec.ingress.enabled. If you'd like to merge my changes to your branch, i can merge this PR afterwards.

@gambol99
Copy link
Contributor Author

gambol99 commented Oct 2, 2019

hi @pb82 .. sorry for the delay.. i've merged in your branch in .. :-)

@pb82 pb82 merged commit eff6eaf into grafana:master Oct 3, 2019
@pb82
Copy link
Collaborator

pb82 commented Oct 3, 2019

@gambol99 Awesome, thanks for the great work! I've merged your changes and will soon release them as part of v2.0.0 after merging some other open PRs!

NissesSenap pushed a commit to NissesSenap/grafana-operator that referenced this pull request Mar 10, 2023
* Document way of working
* e2e workflow
* install kuttl through makefile
NissesSenap pushed a commit to NissesSenap/grafana-operator that referenced this pull request Mar 14, 2023
* Document way of working
* e2e workflow
* install kuttl through makefile
NissesSenap pushed a commit that referenced this pull request Mar 14, 2023
* Document way of working
* e2e workflow
* install kuttl through makefile
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.

None yet

2 participants