Skip to content

Commit

Permalink
redpanda: move statefulset.yaml to go
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-g committed Jul 12, 2024
1 parent 0f122f4 commit e3b29a1
Show file tree
Hide file tree
Showing 88 changed files with 21,456 additions and 20,050 deletions.
14 changes: 7 additions & 7 deletions charts/redpanda/configmap.tpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ func rpkProfile(dot *helmette.Dot) map[string]any {
values := helmette.Unwrap[Values](dot.Values)

brokerList := []string{}
for i := 0; i < values.Statefulset.Replicas; i++ {
for i := int32(0); i < values.Statefulset.Replicas; i++ {
brokerList = append(brokerList, fmt.Sprintf("%s:%d", advertisedHost(dot, i), int(advertisedKafkaPort(dot, i))))
}

adminAdvertisedList := []string{}
for i := 0; i < values.Statefulset.Replicas; i++ {
for i := int32(0); i < values.Statefulset.Replicas; i++ {
adminAdvertisedList = append(adminAdvertisedList, fmt.Sprintf("%s:%d", advertisedHost(dot, i), int(advertisedAdminPort(dot, i))))
}

Expand Down Expand Up @@ -193,7 +193,7 @@ func rpkProfile(dot *helmette.Dot) map[string]any {
return result
}

func advertisedKafkaPort(dot *helmette.Dot, i int) int {
func advertisedKafkaPort(dot *helmette.Dot, i int32) int {
values := helmette.Unwrap[Values](dot.Values)

externalKafkaListenerName := getFirstExternalKafkaListener(dot)
Expand All @@ -215,7 +215,7 @@ func advertisedKafkaPort(dot *helmette.Dot, i int) int {
return port
}

func advertisedAdminPort(dot *helmette.Dot, i int) int {
func advertisedAdminPort(dot *helmette.Dot, i int32) int {
values := helmette.Unwrap[Values](dot.Values)

keys := helmette.Keys(values.Listeners.Admin.External)
Expand All @@ -241,7 +241,7 @@ func advertisedAdminPort(dot *helmette.Dot, i int) int {
return port
}

func advertisedHost(dot *helmette.Dot, i int) string {
func advertisedHost(dot *helmette.Dot, i int32) string {
values := helmette.Unwrap[Values](dot.Values)

address := fmt.Sprintf("%s-%d", Fullname(dot), int(i))
Expand Down Expand Up @@ -281,7 +281,7 @@ func rpkConfiguration(dot *helmette.Dot) map[string]any {

brokerList := []string{}
r := values.Statefulset.Replicas
for i := 0; i < r; i++ {
for i := int32(0); i < r; i++ {
brokerList = append(brokerList, fmt.Sprintf("%s-%d.%s:%d", Fullname(dot), i, InternalDomain(dot), int(values.Listeners.Kafka.Port)))
}

Expand Down Expand Up @@ -362,7 +362,7 @@ func kafkaClient(dot *helmette.Dot) map[string]any {
values := helmette.Unwrap[Values](dot.Values)

brokerList := []map[string]any{}
for i := 0; i < values.Statefulset.Replicas; i++ {
for i := int32(0); i < values.Statefulset.Replicas; i++ {
brokerList = append(brokerList, map[string]any{
"address": fmt.Sprintf("%s-%d.%s", Fullname(dot), i, InternalDomain(dot)),
"port": values.Listeners.Kafka.Port,
Expand Down
4 changes: 2 additions & 2 deletions charts/redpanda/secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ func secretConfiguratorKafkaConfig(dot *helmette.Dot) []string {
``,
fmt.Sprintf(`ADVERTISED_%s_ADDRESSES=()`, helmette.Upper(listenerName)),
)
for _, replicaIndex := range helmette.Until(values.Statefulset.Replicas) {
for _, replicaIndex := range helmette.Until(int(values.Statefulset.Replicas)) {
// advertised-port for kafka
port := externalVals.Port // This is always defined for kafka
if len(externalVals.AdvertisedPorts) > 0 {
Expand Down Expand Up @@ -586,7 +586,7 @@ func secretConfiguratorHTTPConfig(dot *helmette.Dot) []string {
``,
fmt.Sprintf(`ADVERTISED_%s_ADDRESSES=()`, helmette.Upper(listenerName)),
)
for _, replicaIndex := range helmette.Until(values.Statefulset.Replicas) {
for _, replicaIndex := range helmette.Until(int(values.Statefulset.Replicas)) {
// advertised-port for kafka
port := externalVals.Port // This is always defined for kafka
if len(externalVals.AdvertisedPorts) > 0 {
Expand Down
4 changes: 2 additions & 2 deletions charts/redpanda/service.loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func LoadBalancerServices(dot *helmette.Dot) []*corev1.Service {

var services []*corev1.Service
replicas := values.Statefulset.Replicas // TODO fix me once the transpiler is fixed.
for i := 0; i < replicas; i++ {
for i := int32(0); i < replicas; i++ {
podname := fmt.Sprintf("%s-%d", Fullname(dot), i)

// NB: A range loop is used here as its the most terse way to handle
Expand All @@ -63,7 +63,7 @@ func LoadBalancerServices(dot *helmette.Dot) []*corev1.Service {

if externalDNS.Enabled {
prefix := podname
if len(values.External.Addresses) > i {
if len(values.External.Addresses) > int(i) {
prefix = values.External.Addresses[i]
}

Expand Down
Loading

0 comments on commit e3b29a1

Please sign in to comment.