Merge pull request #380 from alrf/hostnetwork

Hostnetwork
grafana · Mar 29, 2021 · cbe6716 · cbe6716
2 parents 5b7eee1 + 496569a
commit cbe6716
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/documentation/deploy_grafana.md b/documentation/deploy_grafana.md
@@ -316,6 +316,8 @@ spec:
     ...
     envFrom:                        # Environment variables from Secret or ConfigMap. The key of data becomes the env name.
     ...
+    hostNetwork: <bool>             # hostNetwork option, DNSPolicy will be accordingly changed (ClusterFirst by default and ClusterFirstWithHostNet for hostNetwork: true)
+    ...
     skipCreateAdminAccount: <bool>  # Skip creating the admin account when providing custom credentials from a secret.
     ...
     priorityClassName: <string>     # Assign a priorityClass name to the grafana pod. Empty by default.

diff --git a/pkg/apis/integreatly/v1alpha1/grafana_types.go b/pkg/apis/integreatly/v1alpha1/grafana_types.go
@@ -104,6 +104,7 @@ type GrafanaDeployment struct {
 	EnvFrom                       []v1.EnvFromSource     `json:"envFrom,omitempty"`
 	SkipCreateAdminAccount        *bool                  `json:"skipCreateAdminAccount,omitempty"`
 	PriorityClassName             string                 `json:"priorityClassName,omitempty"`
+	HostNetwork                   *bool                  `json:"hostNetwork,omitempty"`
 }
 
 // GrafanaIngress provides a means to configure the ingress created

diff --git a/pkg/apis/integreatly/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/integreatly/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/model/grafanaDeployment.go b/pkg/controller/model/grafanaDeployment.go
@@ -32,6 +32,21 @@ func getSkipCreateAdminAccount(cr *v1alpha1.Grafana) bool {
 	return false
 }
 
+func getHostNetwork(cr *v1alpha1.Grafana) bool {
+	if cr.Spec.Deployment != nil && cr.Spec.Deployment.HostNetwork != nil {
+		return *cr.Spec.Deployment.HostNetwork
+	}
+
+	return false
+}
+
+func getDNSPolicy(cr *v1alpha1.Grafana) v13.DNSPolicy {
+	if getHostNetwork(cr) == true {
+		return "ClusterFirstWithHostNet"
+	}
+	return "ClusterFirst"
+}
+
 func getInitResources(cr *v1alpha1.Grafana) v13.ResourceRequirements {
 	if cr.Spec.InitResources != nil {
 		return *cr.Spec.InitResources
@@ -553,6 +568,8 @@ func getDeploymentSpec(cr *v1alpha1.Grafana, annotations map[string]string, conf
 				Tolerations:                   getTolerations(cr),
 				Affinity:                      getAffinities(cr),
 				SecurityContext:               getSecurityContext(cr),
+				HostNetwork:                   getHostNetwork(cr),
+				DNSPolicy:                     getDNSPolicy(cr),
 				Volumes:                       getVolumes(cr),
 				InitContainers:                getInitContainers(cr, plugins),
 				Containers:                    getContainers(cr, configHash, dsHash),