8000 Adding ownerreferences field generation by preved911 · Pull Request #737 · Altinity/clickhouse-operator · GitHub
[go: up one dir, main page]

Skip to content
Merged
8000
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions pkg/controller/chi/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,12 @@ func (c *Controller) enqueueObject(obj queue.PriorityQueueItem) {
switch command.cmd {
case reconcileAdd:
newjs, _ := json.Marshal(command.new)
newchi := chi.ClickHouseInstallation{}
newchi := chi.ClickHouseInstallation{
TypeMeta: meta.TypeMeta{
APIVersion: chi.SchemeGroupVersion.String(),
Kind: chi.ClickHouseInstallationCRDResourceKind,
},
}
json.Unmarshal(newjs, &newchi)
command.new = &newchi
case reconcileUpdate:
Expand Down Expand Up @@ -443,7 +448,12 @@ func (c *Controller) enqueueObject(obj queue.PriorityQueueItem) {
oldjs, _ := json.Marshal(command.old)
newjs, _ := json.Marshal(command.new)
oldchi := chi.ClickHouseInstallation{}
newchi := chi.ClickHouseInstallation{}
newchi := chi.ClickHouseInstallation{
TypeMeta: meta.TypeMeta{
APIVersion: chi.SchemeGroupVersion.String(),
Kind: chi.ClickHouseInstallationCRDResourceKind,
},
}
json.Unmarshal(oldjs, &oldchi)
json.Unmarshal(newjs, &newchi)
command.old = &oldchi
Expand Down
66 changes: 48 additions & 18 deletions pkg/model/creator.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func NewCreator(chi *chiv1.ClickHouseInstallation) *Creator {
// CreateServiceCHI creates new corev1.Service for specified CHI
func (c *Creator) CreateServiceCHI() *corev1.Service {
serviceName := CreateCHIServiceName(c.chi)
ownerReferences := getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true)

c.a.V(1).F().Info("%s/%s", c.chi.Namespace, serviceName)
if template, ok := c.chi.GetCHIServiceTemplate(); ok {
Expand All @@ -60,16 +61,18 @@ func (c *Creator) CreateServiceCHI() *corev1.Service {
serviceName,
c.labeler.getLabelsServiceCHI(),
c.labeler.getSelectorCHIScopeReady(),
ownerReferences,
)
}

// Create default Service
// We do not have .templates.ServiceTemplate specified or it is incorrect
svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: serviceName,
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsServiceCHI(),
Name: serviceName,
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsServiceCHI(),
OwnerReferences: ownerReferences,
},
Spec: corev1.ServiceSpec{
// ClusterIP: templateDefaultsServiceClusterIP,
Expand Down Expand Up @@ -99,6 +102,7 @@ func (c *Creator) CreateServiceCHI() *corev1.Service {
// CreateServiceCluster creates new corev1.Service for specified Cluster
func (c *Creator) CreateServiceCluster(cluster *chiv1.ChiCluster) *corev1.Service {
serviceName := CreateClusterServiceName(cluster)
ownerReferences := getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true)

c.a.V(1).F().Info("%s/%s", cluster.Address.Namespace, serviceName)
if template, ok := cluster.GetServiceTemplate(); ok {
Expand All @@ -109,6 +113,7 @@ func (c *Creator) CreateServiceCluster(cluster *chiv1.ChiCluster) *corev1.Servic
serviceName,
c.labeler.getLabelsServiceCluster(cluster),
getSelectorClusterScopeReady(cluster),
ownerReferences,
)
}
// No template specified, no need to create service
Expand All @@ -118,6 +123,7 @@ func (c *Creator) CreateServiceCluster(cluster *chiv1.ChiCluster) *corev1.Servic
// CreateServiceShard creates new corev1.Service for specified Shard
func (c *Creator) CreateServiceShard(shard *chiv1.ChiShard) *corev1.Service {
serviceName := CreateShardServiceName(shard)
ownerReferences := getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true)

c.a.V(1).F().Info("%s/%s", shard.Address.Namespace, serviceName)
if template, ok := shard.GetServiceTemplate(); ok {
Expand All @@ -128,6 +134,7 @@ func (c *Creator) CreateServiceShard(shard *chiv1.ChiShard) *corev1.Service {
serviceName,
c.labeler.getLabelsServiceShard(shard),
getSelectorShardScopeReady(shard),
ownerReferences,
)
}
// No template specified, no need to create service
Expand All @@ -138,6 +145,7 @@ func (c *Creator) CreateServiceShard(shard *chiv1.ChiShard) *corev1.Service {
func (c *Creator) CreateServiceHost(host *chiv1.ChiHost) *corev1.Service {
serviceName := CreateStatefulSetServiceName(host)
statefulSetName := CreateStatefulSetName(host)
ownerReferences := getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true)

c.a.V(1).F().Info("%s/%s for Set %s", host.Address.Namespace, serviceName, statefulSetName)
if template, ok := host.GetServiceTemplate(); ok {
Expand All @@ -148,16 +156,18 @@ func (c *Creator) CreateServiceHost(host *chiv1.ChiHost) *corev1.Service {
serviceName,
c.labeler.getLabelsServiceHost(host),
GetSelectorHostScope(host),
ownerReferences,
)
}

// Create default Service
// We do not have .templates.ServiceTemplate specified or it is incorrect
svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: serviceName,
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsServiceHost(host),
Name: serviceName,
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsServiceHost(host),
OwnerReferences: ownerReferences,
},
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
Expand Down Expand Up @@ -210,6 +220,7 @@ func (c *Creator) createServiceFromTemplate(
name string,
labels map[string]string,
selector map[string]string,
ownerReferences []metav1.OwnerReference,
) *corev1.Service {

// Verify Ports
Expand All @@ -226,6 +237,7 @@ func (c *Creator) createServiceFromTemplate(
// Overwrite .name and .namespace - they are not allowed to be specified in template
service.Name = name
service.Namespace = namespace
service.OwnerReferences = ownerReferences

// Append provided Labels to already specified Labels in template
service.Labels = util.MergeStringMapsOverwrite(service.Labels, labels)
Expand All @@ -243,9 +255,10 @@ func (c *Creator) createServiceFromTemplate(
func (c *Creator) CreateConfigMapCHICommon(options *ClickHouseConfigFilesGeneratorOptions) *corev1.ConfigMap {
cm := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: CreateConfigMapCommonName(c.chi),
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsConfigMapCHICommon(),
Name: CreateConfigMapCommonName(c.chi),
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsConfigMapCHICommon(),
OwnerReferences: getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true),
},
// Data contains several sections which are to be several xml chopConfig files
Data: c.chConfigFilesGenerator.CreateConfigFilesGroupCommon(options),
Expand All @@ -259,9 +272,10 @@ func (c *Creator) CreateConfigMapCHICommon(options *ClickHouseConfigFilesGenerat
func (c *Creator) CreateConfigMapCHICommonUsers() *corev1.ConfigMap {
cm := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: CreateConfigMapCommonUsersName(c.chi),
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsConfigMapCHICommonUsers(),
Name: CreateConfigMapCommonUsersName(c.chi),
Namespace: c.chi.Namespace,
Labels: c.labeler.getLabelsConfigMapCHICommonUsers(),
OwnerReferences: getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true),
},
// Data contains several sections which are to be several xml chopConfig files
Data: c.chConfigFilesGenerator.CreateConfigFilesGroupUsers(),
Expand All @@ -275,9 +289,10 @@ func (c *Creator) CreateConfigMapCHICommonUsers() *corev1.ConfigMap {
func (c *Creator) CreateConfigMapHost(host *chiv1.ChiHost) *corev1.ConfigMap {
cm := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: CreateConfigMapPersonalName(host),
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsConfigMapHost(host),
Name: CreateConfigMapPersonalName(host),
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsConfigMapHost(host),
OwnerReferences: getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true),
},
Data: c.chConfigFilesGenerator.CreateConfigFilesGroupHost(host),
}
Expand All @@ -290,16 +305,18 @@ func (c *Creator) CreateConfigMapHost(host *chiv1.ChiHost) *corev1.ConfigMap {
func (c *Creator) CreateStatefulSet(host *chiv1.ChiHost) *apps.StatefulSet {
statefulSetName := CreateStatefulSetName(host)
serviceName := CreateStatefulSetServiceName(host)
ownerReferences := getOwnerReferences(c.chi.TypeMeta, c.chi.ObjectMeta, true, true)

// Create apps.StatefulSet object
replicasNum := host.GetStatefulSetReplicasNum()
revisionHistoryLimit := int32(10)
// StatefulSet has additional label - ZK config fingerprint
statefulSet := &apps.StatefulSet{
ObjectMeta: metav1.ObjectMeta{
Name: statefulSetName,
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsHostScope(host, true),
Name: statefulSetName,
Namespace: host.Address.Namespace,
Labels: c.labeler.getLabelsHostScope(host, true),
OwnerReferences: ownerReferences,
},
Spec: apps.StatefulSetSpec{
Replicas: &replicasNum,
Expand Down Expand Up @@ -1013,3 +1030,16 @@ func getContainerByName(statefulSet *apps.StatefulSet, name string) *corev1.Cont

return nil
}

func getOwnerReferences(t metav1.TypeMeta, o metav1.ObjectMeta, controller, blockOwnerDeletion bool) []metav1.OwnerReference {
return []metav1.OwnerReference{
metav1.OwnerReference{
APIVersion: t.APIVersion,
Kind: t.Kind,
Name: o.Name,
UID: o.UID,
Controller: &controller,
BlockOwnerDeletion: &blockOwnerDeletion,
},
}
}
0