Update kustomize manifests. Call UpdateStatus.

Signed-off-by: James Munnelly <james@munnelly.eu>

Author: munnerz

Makefile

@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= munnerz/kubewg-manager:canary
+IMG ?= munnerz/kubewg:canary
 
 all: test manager
 

config/default/kustomization.yaml config/kustomization.yamlconfig/default/kustomization.yaml renamed to config/kustomization.yaml

@@ -18,22 +18,22 @@ namePrefix: kubewg-
 # YAML string, with resources separated by document
 # markers ("---").
 resources:
-- ../rbac/rbac_role.yaml
-- ../rbac/rbac_role_binding.yaml
-- ../manager/manager.yaml
+- rbac/rbac_role.yaml
+- rbac/rbac_role_binding.yaml
+- manager/manager.yaml
   # Comment the following 3 lines if you want to disable
   # the auth proxy (https://github.com/brancz/kube-rbac-proxy)
   # which protects your /metrics endpoint.
-- ../rbac/auth_proxy_service.yaml
-- ../rbac/auth_proxy_role.yaml
-- ../rbac/auth_proxy_role_binding.yaml
+- rbac/auth_proxy_service.yaml
+- rbac/auth_proxy_role.yaml
+- rbac/auth_proxy_role_binding.yaml
 
 patches:
-- manager_image_patch.yaml
+- patches/manager_image_patch.yaml
   # Protect the /metrics endpoint by putting it behind auth.
   # Only one of manager_auth_proxy_patch.yaml and
   # manager_prometheus_metrics_patch.yaml should be enabled.
-- manager_auth_proxy_patch.yaml
+- patches/manager_auth_proxy_patch.yaml
   # If you want your controller-manager to expose the /metrics
   # endpoint w/o any authn/z, uncomment the following line and
   # comment manager_auth_proxy_patch.yaml.

…ig/default/manager_auth_proxy_patch.yaml …ig/patches/manager_auth_proxy_patch.yamlconfig/default/manager_auth_proxy_patch.yaml renamed to config/patches/manager_auth_proxy_patch.yaml config/default/manager_auth_proxy_patch.yaml renamed to config/patches/manager_auth_proxy_patch.yaml

@@ -4,7 +4,6 @@ metadata:
   name: mnrz
 spec:
   subnet: 10.30.51.0/24
-  selector: {}
 ---
 apiVersion: wg.mnrz.xyz/v1alpha1
 kind: Peer
@@ -50,7 +49,6 @@ metadata:
   name: marley
 spec:
   subnet: 192.168.53.1/24
-  selector: {}
 ---
 apiVersion: wg.mnrz.xyz/v1alpha1
 kind: Peer

config/default/manager_image_patch.yaml config/patches/manager_image_patch.yamlconfig/default/manager_image_patch.yaml renamed to config/patches/manager_image_patch.yaml

@@ -228,7 +228,7 @@ func (r *ReconcilePeer) Reconcile(request reconcile.Request) (reconcile.Result,
 
 	if !reflect.DeepEqual(instance.Status, peer.Status) {
 		log.Info("Updating Peer", "namespace", peer.Namespace, "name", peer.Name)
-		err = r.Update(context.TODO(), peer)
+		err = r.Status().Update(context.TODO(), peer)
 		if err != nil {
 			return reconcile.Result{}, err
 		}