Skip to content

Commit

Permalink
Use dns cluster info from lib common get function
Browse files Browse the repository at this point in the history
Openshift coreDNS creates the domain name using an string
located in dnses.operator.openshift.io. This string can
change in the future, calling lib-common/GetDNSClusterDomain
the responsability of gathering this information correctly
only falls under lib-common intead of all operators.

Resolves: OSPRH-3627
Depends-on: openstack-k8s-operators/lib-common#580
  • Loading branch information
averdagu committed Dec 10, 2024
1 parent cbad718 commit 1a9adb5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/redis/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
common "github.com/openstack-k8s-operators/lib-common/modules/common"
cluster "github.com/openstack-k8s-operators/lib-common/modules/clusterdns"
labels "github.com/openstack-k8s-operators/lib-common/modules/common/labels"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -61,6 +62,7 @@ func StatefulSet(
Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(26379)},
}
name := r.Name + "-" + "redis"
clusterDomain := coredns.GetDNSClusterDomain()

commonEnvVars := []corev1.EnvVar{{
Name: "KOLLA_CONFIG_STRATEGY",
Expand All @@ -69,8 +71,7 @@ func StatefulSet(
Name: "SVC_FQDN",
// https://github.com/kubernetes/dns/blob/master/docs/specification.md
// Headless services only publish dns entries that include cluster domain.
// For the time being, assume this is .cluster.local
Value: name + "." + r.GetNamespace() + ".svc.cluster.local",
Value: name + "." + r.GetNamespace() + ".svc." + clusterDomain,
}, {
Name: "CONFIG_HASH",
Value: configHash,
Expand Down

0 comments on commit 1a9adb5

Please sign in to comment.