chore: refactor controller

Makefile

@@ -121,7 +121,7 @@ build-manager: generate fmt vet ## Build manager binary.
 	go build -o bin/manager ./cmd/manager/main.go
 
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./cmd/manager/main.go
+	go run ./cmd/manager/main.go --agent-image "ghcr.io/jodevsa/wireguard-operator/agent:dev-last-today-131"
 
 
 

cmd/manager/main.go

@@ -84,7 +84,7 @@ func main() {
 	}
 
 	if wgImage == "" {
-		setupLog.Error(fmt.Errorf("--wireguard-container-image flag is not set"), "unable to start manager")
+		setupLog.Error(fmt.Errorf("--agent-image flag is not set"), "unable to start manager")
 		os.Exit(1)
 	}
 

config/crd/bases/vpn.wireguard-operator.io_wireguardpeers.yaml

@@ -39,15 +39,39 @@ spec:
           spec:
             description: The desired state of the peer.
             properties:
+              PrivateKeyRef:
+                description: The private key of the peer
+                properties:
+                  secretKeyRef:
+                    description: SecretKeySelector selects a key of a Secret.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                required:
+                - secretKeyRef
+                type: object
               address:
                 description: |-
                   INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "make" to regenerate code after modifying this file
                   The address of the peer.
                 type: string
-              allowedIPs:
-                description: The AllowedIPs of the peer.
-                type: string
               disabled:
                 description: Set to true to temporarily disable the peer.
                 type: boolean

config/crd/bases/vpn.wireguard-operator.io_wireguards.yaml

@@ -207,12 +207,16 @@ spec:
           status:
             description: WireguardStatus defines the observed state of Wireguard
             properties:
+              UniqueIdentifier:
+                type: string
               address:
                 description: A string field that specifies the address for the Wireguard
                   VPN server that is currently being used.
                 type: string
               dns:
                 type: string
+              dnssearchdomain:
+                type: string
               message:
                 description: A string field that provides additional information about
                   the status of Wireguard. This could include error messages or other
@@ -222,6 +226,19 @@ spec:
                 description: A string field that specifies the port for the Wireguard
                   VPN server that is currently being used.
                 type: string
+              publickey:
+                type: string
+              resources:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    status:
+                      type: string
+                    type:
+                      type: string
+                  type: object
+                type: array
               status:
                 description: A string field that represents the current status of
                   Wireguard. This could include values like ready, pending, or error.

pkg/api/v1alpha1/wireguard_types.go

@@ -67,14 +67,29 @@ type WireguardPodSpec struct {
 // WireguardStatus defines the observed state of Wireguard
 type WireguardStatus struct {
 	// A string field that specifies the address for the Wireguard VPN server that is currently being used.
-	Address string `json:"address,omitempty"`
-	Dns     string `json:"dns,omitempty"`
+	Address         string `json:"address,omitempty"`
+	Dns             string `json:"dns,omitempty"`
+	DnsSearchDomain string `json:"dnssearchdomain,omitempty"`
+	PublicKey       string `json:"publickey,omitempty"`
 	// A string field that specifies the port for the Wireguard VPN server that is currently being used.
 	Port string `json:"port,omitempty"`
 	// A string field that represents the current status of Wireguard. This could include values like ready, pending, or error.
 	Status string `json:"status,omitempty"`
 	// A string field that provides additional information about the status of Wireguard. This could include error messages or other information that helps to diagnose issues with the wg instance.
-	Message string `json:"message,omitempty"`
+	Message          string     `json:"message,omitempty"`
+	Resources        []Resource `json:"resources,omitempty"`
+	UniqueIdentifier string     `json:"UniqueIdentifier,omitempty"`
+}
+type Resource struct {
+	Name   string `json:"name,omitempty"`
+	Type   string `json:"type,omitempty"`
+	Status string `json:"status,omitempty"`
+}
+
+type DeploymentResource struct {
+	Name   string `json:"name,omitempty"`
+	Status string `json:"status,omitempty"`
+	Image  string `json:"image,omitempty"`
 }
 
 //+kubebuilder:object:root=true

pkg/api/v1alpha1/wireguardpeer_types.go

@@ -132,6 +132,10 @@ type WireguardPeerList struct {
 	Items           []WireguardPeer `json:"items"`
 }
 
+func (in *WireguardPeerList) Error() string {
+	panic("implement me")
+}
+
 func init() {
 	SchemeBuilder.Register(&WireguardPeer{}, &WireguardPeerList{})
 }