From 3dd535f7552e3f0a3f28b3ed585ab21eda04716f Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Thu, 23 Dec 2021 16:21:38 +0000 Subject: [PATCH] [Improvement] Remove unused sidecar variable --- CHANGELOG.md | 1 + pkg/apis/deployment/v1/member_status.go | 8 ++++---- pkg/apis/deployment/v1/zz_generated.deepcopy.go | 14 +++++++------- pkg/apis/deployment/v2alpha1/member_status.go | 8 ++++---- .../deployment/v2alpha1/zz_generated.deepcopy.go | 14 +++++++------- pkg/deployment/resources/pod_creator.go | 8 ++------ 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 931133dd8..4f15f19eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A) - Add Plan BackOff functionality - Fix Core InitContainers check +- Remove unused `status.members..sidecars-specs` variable ## [1.2.6](https://github.com/arangodb/kube-arangodb/tree/1.2.6) (2021-12-15) - Add ArangoBackup backoff functionality diff --git a/pkg/apis/deployment/v1/member_status.go b/pkg/apis/deployment/v1/member_status.go index 8a3b38f50..72c8016b7 100644 --- a/pkg/apis/deployment/v1/member_status.go +++ b/pkg/apis/deployment/v1/member_status.go @@ -23,7 +23,6 @@ package v1 import ( - "reflect" "time" "github.com/arangodb/kube-arangodb/pkg/util/k8sutil" @@ -69,8 +68,6 @@ type MemberStatus struct { IsInitialized bool `json:"initialized"` // CleanoutJobID holds the ID of the agency job for cleaning out this server CleanoutJobID string `json:"cleanout-job-id,omitempty"` - // SideCarSpecs contains list of specifications specified for side cars - SideCarSpecs map[string]v1.Container `json:"sidecars-specs,omitempty"` // ArangoVersion holds the ArangoDB version in member ArangoVersion driver.Version `json:"arango-version,omitempty"` // ImageId holds the members ArangoDB image ID @@ -85,6 +82,10 @@ type MemberStatus struct { Endpoint *string `json:"endpoint,omitempty"` // Topology define topology member status assignment Topology *TopologyMemberStatus `json:"topology,omitempty"` + + // deprecated + // SideCarSpecs contains list of specifications specified for side cars + SideCarSpecs map[string]v1.Container `json:"sidecars-specs,omitempty"` } // Equal checks for equality @@ -99,7 +100,6 @@ func (s MemberStatus) Equal(other MemberStatus) bool { s.Conditions.Equal(other.Conditions) && s.IsInitialized == other.IsInitialized && s.CleanoutJobID == other.CleanoutJobID && - reflect.DeepEqual(s.SideCarSpecs, other.SideCarSpecs) && s.ArangoVersion == other.ArangoVersion && s.ImageID == other.ImageID && s.Image.Equal(other.Image) && diff --git a/pkg/apis/deployment/v1/zz_generated.deepcopy.go b/pkg/apis/deployment/v1/zz_generated.deepcopy.go index 82fc60ee9..ea0582a5a 100644 --- a/pkg/apis/deployment/v1/zz_generated.deepcopy.go +++ b/pkg/apis/deployment/v1/zz_generated.deepcopy.go @@ -1295,13 +1295,6 @@ func (in *MemberStatus) DeepCopyInto(out *MemberStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.SideCarSpecs != nil { - in, out := &in.SideCarSpecs, &out.SideCarSpecs - *out = make(map[string]corev1.Container, len(*in)) - for key, val := range *in { - (*out)[key] = *val.DeepCopy() - } - } if in.Image != nil { in, out := &in.Image, &out.Image *out = new(ImageInfo) @@ -1322,6 +1315,13 @@ func (in *MemberStatus) DeepCopyInto(out *MemberStatus) { *out = new(TopologyMemberStatus) **out = **in } + if in.SideCarSpecs != nil { + in, out := &in.SideCarSpecs, &out.SideCarSpecs + *out = make(map[string]corev1.Container, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } return } diff --git a/pkg/apis/deployment/v2alpha1/member_status.go b/pkg/apis/deployment/v2alpha1/member_status.go index 00b2e3132..7ccc55ee2 100644 --- a/pkg/apis/deployment/v2alpha1/member_status.go +++ b/pkg/apis/deployment/v2alpha1/member_status.go @@ -23,7 +23,6 @@ package v2alpha1 import ( - "reflect" "time" "github.com/arangodb/kube-arangodb/pkg/util/k8sutil" @@ -69,8 +68,6 @@ type MemberStatus struct { IsInitialized bool `json:"initialized"` // CleanoutJobID holds the ID of the agency job for cleaning out this server CleanoutJobID string `json:"cleanout-job-id,omitempty"` - // SideCarSpecs contains list of specifications specified for side cars - SideCarSpecs map[string]v1.Container `json:"sidecars-specs,omitempty"` // ArangoVersion holds the ArangoDB version in member ArangoVersion driver.Version `json:"arango-version,omitempty"` // ImageId holds the members ArangoDB image ID @@ -85,6 +82,10 @@ type MemberStatus struct { Endpoint *string `json:"endpoint,omitempty"` // Topology define topology member status assignment Topology *TopologyMemberStatus `json:"topology,omitempty"` + + // deprecated + // SideCarSpecs contains list of specifications specified for side cars + SideCarSpecs map[string]v1.Container `json:"sidecars-specs,omitempty"` } // Equal checks for equality @@ -99,7 +100,6 @@ func (s MemberStatus) Equal(other MemberStatus) bool { s.Conditions.Equal(other.Conditions) && s.IsInitialized == other.IsInitialized && s.CleanoutJobID == other.CleanoutJobID && - reflect.DeepEqual(s.SideCarSpecs, other.SideCarSpecs) && s.ArangoVersion == other.ArangoVersion && s.ImageID == other.ImageID && s.Image.Equal(other.Image) && diff --git a/pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go index ea7f3beee..6783075e6 100644 --- a/pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go @@ -1295,13 +1295,6 @@ func (in *MemberStatus) DeepCopyInto(out *MemberStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.SideCarSpecs != nil { - in, out := &in.SideCarSpecs, &out.SideCarSpecs - *out = make(map[string]v1.Container, len(*in)) - for key, val := range *in { - (*out)[key] = *val.DeepCopy() - } - } if in.Image != nil { in, out := &in.Image, &out.Image *out = new(ImageInfo) @@ -1322,6 +1315,13 @@ func (in *MemberStatus) DeepCopyInto(out *MemberStatus) { *out = new(TopologyMemberStatus) **out = **in } + if in.SideCarSpecs != nil { + in, out := &in.SideCarSpecs, &out.SideCarSpecs + *out = make(map[string]v1.Container, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } return } diff --git a/pkg/deployment/resources/pod_creator.go b/pkg/deployment/resources/pod_creator.go index 28e1995b5..dab51a061 100644 --- a/pkg/deployment/resources/pod_creator.go +++ b/pkg/deployment/resources/pod_creator.go @@ -470,7 +470,6 @@ func (r *Resources) createPodForMember(ctx context.Context, cachedStatus inspect if !found { return errors.WithStack(errors.Newf("Member '%s' not found", memberID)) } - groupSpec := spec.GetServerGroupSpec(group) // Update pod name role := group.AsRole() @@ -498,11 +497,8 @@ func (r *Resources) createPodForMember(ctx context.Context, cachedStatus inspect m.ArangoVersion = m.Image.ArangoDBVersion m.ImageID = m.Image.ImageID - // Check for missing side cars in - m.SideCarSpecs = make(map[string]core.Container) - for _, specSidecar := range groupSpec.GetSidecars() { - m.SideCarSpecs[specSidecar.Name] = *specSidecar.DeepCopy() - } + // reset old sidecar values to nil + m.SideCarSpecs = nil log.Debug().Str("pod-name", m.PodName).Msg("Created pod") if m.Image == nil {