-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
chore: refactor controller #185
base: main
Are you sure you want to change the base?
Conversation
the operator code is so much coupled. Part of it is kind-of related to operator-sdk not providing any framework or abstractions for building operator resources. I'll be creating some abstractions in a separate repo to act as a base for operator builders. This is a lot of work but is something that is crucial and needed for the community. |
return false, nil | ||
} | ||
func (p Peers) getPeerConfig(peer v1alpha1.WireguardPeer) string { | ||
cfg := fmt.Sprintf(` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we should actually encode real object instead of string formatting. We wouldn't do this for yaml or json, so why from toml?
Hypothetically:
type WireguardConfiguration struct {
Interface WireguardInterfaceConfiguration
// ...
}
type WireguardInterfaceConfiguration struct {
PrivateKey string
Address string
DNS string
}
b, err := toml.Marshal(WireguardConfiguration{
Interface: WireguardInterfaceConfiguration{
PrivateKey: fmt.Sprintf("$(kubectl get secret %s-peer --template={{.data.privateKey}} -n %s | base64 -d)", peer.Name, peer.Namespace),
Address: peer.Spec.Address
DNS: p.constructDnsConfig()
},
})
// ...
if !bytes.Equal(expectedSecret.Data["state.json"], secret.Data["state.json"]) { | ||
return true, nil | ||
|
||
} | ||
|
||
return false, nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if !bytes.Equal(expectedSecret.Data["state.json"], secret.Data["state.json"]) { | |
return true, nil | |
} | |
return false, nil | |
return !bytes.Equal(expectedSecret.Data["state.json"], secret.Data["state.json"]), nil |
} else if err == nil { | ||
privateKey = string(sec.Data["privateKey"]) | ||
publicKey = string(sec.Data["publicKey"]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be moved, as everything after the if err != nil
line matches this condition
@@ -0,0 +1,176 @@ | |||
package resources | |||
|
|||
import ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs formatting (gofmt -s -w .
)
} | ||
|
||
func (s Service) GetAddressAndPort(ctx context.Context) (string, string, error) { | ||
var port = fmt.Sprintf("%d", s.TargetPort) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
var port = fmt.Sprintf("%d", s.TargetPort) | |
port := strconv.Itoa(s.TargetPort) |
first steps to fix #171