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

Kafka and Zookeeper images are no longer used #1125

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Kafka and Zookeeper images are no longer used #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,30 +138,6 @@ func imagePullSecretName(cr *miqv1alpha1.ManageIQ, client client.Client) string
return cr.Spec.ImagePullSecret
}

func kafkaImage(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.KafkaImage == "" {
return kafkaImageName(cr) + ":" + kafkaImageTag(cr)
} else {
return cr.Spec.KafkaImage
}
}

func kafkaImageName(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.KafkaImageName == "" {
return "docker.io/bitnami/kafka"
} else {
return cr.Spec.KafkaImageName
}
}

func kafkaImageTag(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.KafkaImageTag == "" {
return "latest"
} else {
return cr.Spec.KafkaImageTag
}
}

func kafkaVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.KafkaVolumeCapacity == "" {
return "2Gi"
Expand Down Expand Up @@ -321,30 +297,6 @@ func serverGuid(cr *miqv1alpha1.ManageIQ, c *client.Client) string {
}
}

func zookeeperImage(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.ZookeeperImage == "" {
return zookeeperImageName(cr) + ":" + zookeeperImageTag(cr)
} else {
return cr.Spec.ZookeeperImage
}
}

func zookeeperImageName(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.ZookeeperImageName == "" {
return "docker.io/bitnami/zookeeper"
} else {
return cr.Spec.ZookeeperImageName
}
}

func zookeeperImageTag(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.ZookeeperImageTag == "" {
return "latest"
} else {
return cr.Spec.ZookeeperImageTag
}
}

func zookeeperVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
if cr.Spec.ZookeeperVolumeCapacity == "" {
return "1Gi"
Expand Down Expand Up @@ -373,7 +325,6 @@ func ManageCR(cr *miqv1alpha1.ManageIQ, c *client.Client) (*miqv1alpha1.ManageIQ
cr.Spec.HttpdAuthenticationType = httpdAuthenticationType(cr)
cr.Spec.HttpdImage = httpdImage(cr)
cr.Spec.ImagePullSecret = imagePullSecretName(cr, *c)
cr.Spec.KafkaImage = kafkaImage(cr)
cr.Spec.KafkaVolumeCapacity = kafkaVolumeCapacity(cr)
cr.Spec.MemcachedImage = memcachedImage(cr)
cr.Spec.MemcachedMaxConnection = memcachedMaxConnection(cr)
Expand All @@ -386,7 +337,6 @@ func ManageCR(cr *miqv1alpha1.ManageIQ, c *client.Client) (*miqv1alpha1.ManageIQ
cr.Spec.PostgresqlMaxConnections = postgresqlMaxConnections(cr)
cr.Spec.PostgresqlSharedBuffers = postgresqlSharedBuffers(cr)
cr.Spec.ServerGuid = serverGuid(cr, c)
cr.Spec.ZookeeperImage = zookeeperImage(cr)
cr.Spec.ZookeeperVolumeCapacity = zookeeperVolumeCapacity(cr)

addBackupLabel(backupLabelName(cr), &cr.ObjectMeta)
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/manageiq_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ type ManageIQSpec struct {
// +optional
KafkaCpuRequest string `json:"kafkaCpuRequest,omitempty"`

// Image string used for the kafka deployment
// Deprecated: Image string used for the kafka deployment
// (default: <KafkaImageName>:<KafkaImageTag>)
// +optional
KafkaImage string `json:"kafkaImage,omitempty"`
Expand Down Expand Up @@ -355,7 +355,7 @@ type ManageIQSpec struct {
// +optional
ZookeeperCpuRequest string `json:"zookeeperCpuRequest,omitempty"`

// Image string used for the zookeeper deployment
// Deprecated: Image string used for the zookeeper deployment
// (default: <ZookeeperImageName>:<ZookeeperImageTag>)
// +optional
ZookeeperImage string `json:"zookeeperImage,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ spec:
type: string
kafkaImage:
description: |-
Image string used for the kafka deployment
Deprecated: Image string used for the kafka deployment
(default: <KafkaImageName>:<KafkaImageTag>)
type: string
kafkaImageName:
Expand Down Expand Up @@ -338,7 +338,7 @@ spec:
type: string
zookeeperImage:
description: |-
Image string used for the zookeeper deployment
Deprecated: Image string used for the zookeeper deployment
(default: <ZookeeperImageName>:<ZookeeperImageTag>)
type: string
zookeeperImageName:
Expand Down
Loading