amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cluster: introduce Machine.Inactive flag #38

Merged
amery merged 3 commits from pr-amery-dns-ignore into main 2023-10-30 20:44:42 +01:00
Conversation 4 Commits 3 Files Changed 5
+43 -3
amery commented 2023-10-30 19:59:19 +01:00
Owner
Copy Link
Copy Source

reflected on disk as none on a file named region

these machines won't be included in the regional or zonal aliases

reflected on disk as `none` on a file named `region` these machines won't be included in the regional or zonal aliases
amery added 3 commits 2023-10-30 19:59:19 +01:00
cluster: add Machine.ReadLines() shortcut 1580c09746 
Signed-off-by: Alejandro Mery <amery@jpi.io>
cluster: introduce Machine.Inactive flag 851274954e 
if a Machine is Inactive, it won't be included on the DNS
aliases for the zone or it's regions.

Signed-off-by: Alejandro Mery <amery@jpi.io>
cluster: mark Machine as Inactive if the "region" file contains "none" a725b66d14 
Signed-off-by: Alejandro Mery <amery@jpi.io>
amery requested review from karasz 2023-10-30 19:59:51 +01:00
karasz requested changes 2023-10-30 20:05:45 +01:00
karasz left a comment
Owner
Copy Link
Copy Source

see comments

see comments
pkg/cluster/machine.go Outdated
@@ -15,6 +15,7 @@ type Machine struct {
ID int
Name string `json:"-" yaml:"-"`
Inactive bool `json:"inactive,omitempty" yaml:"inactive,omitempty"`
karasz commented 2023-10-30 20:02:16 +01:00
Owner
Copy Link
Copy Source

Please name the field Active

Please name the field `Active`
amery commented 2023-10-30 20:18:37 +01:00
Author
Owner
Copy Link
Copy Source

Active breaks zero-value rules, everything would become inactive by default

`Active` breaks zero-value rules, everything would become inactive by default
pkg/cluster/machine.go Outdated
@@ -46,0 +48,4 @@
func (m *Machine) Active() bool {
return !m.Inactive
}
karasz commented 2023-10-30 20:03:31 +01:00
Owner
Copy Link
Copy Source
func (m *Machine) IsActive() bool {
	return m.Active
}
```go func (m *Machine) IsActive() bool { return m.Active }
amery marked this conversation as resolved
pkg/cluster/machine_scan.go Outdated
@@ -85,0 +99,4 @@
for _, r := range data {
switch r {
case "none":
m.Inactive = true
karasz commented 2023-10-30 20:04:57 +01:00
Owner
Copy Link
Copy Source

please see above s/Inactive/Active/ and switch logic.

please see above s/Inactive/Active/ and switch logic.
pkg/cluster/regions.go Outdated
@@ -33,3 +33,3 @@
z.ForEachMachine(func(p *Machine) bool {
term = fn(p)
if p.Active() {
karasz commented 2023-10-30 20:05:30 +01:00
Owner
Copy Link
Copy Source
if p.IsActive() {
...
```go if p.IsActive() { ... ```
👍 1
amery marked this conversation as resolved
amery commented 2023-10-30 20:17:47 +01:00
Author
Owner
Copy Link
Copy Source

@karasz it's currently called Inactive to deal with the zero value. Active by default, otherwise indicated.

@karasz it's currently called Inactive to deal with the zero value. Active by default, otherwise indicated.
amery added 2 commits 2023-10-30 20:21:15 +01:00
cluster: introduce Machine.Inactive flag 892d849740 
if a Machine is Inactive, it won't be included on the DNS
aliases for the zone or it's regions.

v2:
- Machine.Active() renamed to Machine.IsActive()

Signed-off-by: Alejandro Mery <amery@jpi.io>
cluster: mark Machine as Inactive if the "region" file contains "none" 99998dc7e8 
Signed-off-by: Alejandro Mery <amery@jpi.io>
amery commented 2023-10-30 20:21:34 +01:00
Author
Owner
Copy Link
Copy Source

Machine.Active() renamed to Machine.IsActive()

`Machine.Active()` renamed to `Machine.IsActive()`
amery requested review from karasz 2023-10-30 20:27:28 +01:00
karasz approved these changes 2023-10-30 20:37:02 +01:00
karasz left a comment
Owner
Copy Link
Copy Source

LGTM

LGTM
amery merged commit a910bba406 into main 2023-10-30 20:44:42 +01:00
amery deleted branch pr-amery-dns-ignore 2023-10-30 20:44:42 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
karasz
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
karasz (Nagy Károly Gábriel) amery (Alejandro Mery)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: amery/jpictl#38
Delete Branch "pr-amery-dns-ignore"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?