Skip to content

Commit 47b690b

Browse files
authored
[Improvement] Deprecate Endpoint field in ArangoDeployment (#1293)
1 parent 1c3ba8b commit 47b690b

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
44
- (Bugfix) Fix manual overwrite for ReplicasCount in helm
55
- (Bugfix) Fix for ArangoTask list error
6+
- (Improvement) Deprecate Endpoint field in ArangoDeployment
67

78
## [1.2.25](https://github.com/arangodb/kube-arangodb/tree/1.2.25) (2023-04-07)
89
- (Feature) Add Generics & Drop policy/v1beta1 support

pkg/apis/deployment/v1/arango_member_pod_template.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ type ArangoMemberPodTemplate struct {
5252
PodSpecChecksum string `json:"podSpecChecksum,omitempty"`
5353
Checksum string `json:"checksum,omitempty"`
5454

55+
// deprecated
5556
Endpoint *string `json:"endpoint,omitempty"`
5657
}
5758

pkg/apis/deployment/v1/member_status.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ type MemberStatus struct {
7373
Architecture *ArangoDeploymentArchitectureType `json:"architecture,omitempty"`
7474
// Upgrade define if upgrade should be enforced during next execution
7575
Upgrade bool `json:"upgrade,omitempty"`
76-
// Endpoint definition how member should be reachable
77-
Endpoint *string `json:"endpoint,omitempty"`
76+
7877
// Topology define topology member status assignment
7978
Topology *TopologyMemberStatus `json:"topology,omitempty"`
8079
Pod *MemberPodStatus `json:"pod,omitempty"`
@@ -101,6 +100,9 @@ type MemberStatus struct {
101100
// deprecated
102101
// PersistentVolumeClaimName holds the name of the persistent volume claim used for this member (if any).
103102
PersistentVolumeClaimName string `json:"persistentVolumeClaimName,omitempty"`
103+
// deprecated
104+
// Endpoint definition how member should be reachable
105+
Endpoint *string `json:"-"`
104106
}
105107

106108
// Equal checks for equality
@@ -152,6 +154,7 @@ func (s *MemberStatus) RemoveTerminationsBefore(timestamp time.Time) int {
152154
}
153155
}
154156

157+
// deprecated
155158
func (s *MemberStatus) GetEndpoint(defaultEndpoint string) string {
156159
if s == nil || s.Endpoint == nil {
157160
return defaultEndpoint

pkg/apis/deployment/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/deployment/v2alpha1/arango_member_pod_template.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ type ArangoMemberPodTemplate struct {
5252
PodSpecChecksum string `json:"podSpecChecksum,omitempty"`
5353
Checksum string `json:"checksum,omitempty"`
5454

55+
// deprecated
5556
Endpoint *string `json:"endpoint,omitempty"`
5657
}
5758

pkg/apis/deployment/v2alpha1/member_status.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ type MemberStatus struct {
7373
Architecture *ArangoDeploymentArchitectureType `json:"architecture,omitempty"`
7474
// Upgrade define if upgrade should be enforced during next execution
7575
Upgrade bool `json:"upgrade,omitempty"`
76-
// Endpoint definition how member should be reachable
77-
Endpoint *string `json:"endpoint,omitempty"`
76+
7877
// Topology define topology member status assignment
7978
Topology *TopologyMemberStatus `json:"topology,omitempty"`
8079
Pod *MemberPodStatus `json:"pod,omitempty"`
@@ -101,6 +100,9 @@ type MemberStatus struct {
101100
// deprecated
102101
// PersistentVolumeClaimName holds the name of the persistent volume claim used for this member (if any).
103102
PersistentVolumeClaimName string `json:"persistentVolumeClaimName,omitempty"`
103+
// deprecated
104+
// Endpoint definition how member should be reachable
105+
Endpoint *string `json:"-"`
104106
}
105107

106108
// Equal checks for equality
@@ -152,6 +154,7 @@ func (s *MemberStatus) RemoveTerminationsBefore(timestamp time.Time) int {
152154
}
153155
}
154156

157+
// deprecated
155158
func (s *MemberStatus) GetEndpoint(defaultEndpoint string) string {
156159
if s == nil || s.Endpoint == nil {
157160
return defaultEndpoint

pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)