Merge "move ipam from url to local"

manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml

@@ -30,6 +30,9 @@ spec:
       auth_proxy:
         repository: gcr.io/kubebuilder
         tag: v0.4.0
+      ipam-manager:
+        repository: quay.io/metal3-io
+        tag: v0.0.4
     cacpk:
       manager:
         repository: us.gcr.io/k8s-artifacts-prod/cluster-api

manifests/function/capm3/v0.4.0/ipam/kustomization.yaml

@@ -3,8 +3,8 @@ kind: Kustomization
 
 # When updating the release, update also the image tag in image_patch.yaml
 resources:
-- https://github.com/metal3-io/ip-address-manager/releases/download/v0.0.4/ipam-components.yaml
+- ipam-components.yaml
 
 patchesStrategicMerge:
     - image_patch.yaml
-    - pull_policy_patch.yaml
+    - pull_policy_patch.yaml

manifests/function/clusterctl/clusterctl.yaml

@@ -63,6 +63,9 @@ images:
   infrastructure-metal3/kube-rbac-proxy:
     repository: "gcr.io/kubebuilder"
     tag: "v0.4.0"
+  infrastructure-metal3/ip-address-manager:
+    repository: "quay.io/metal3-io"
+    tag: "v0.4.0"
   infrastructure-docker/capd-manager:
     repository: "gcr.io/k8s-staging-cluster-api"
     tag: "v20201019-v0.3.10-86-gc1647481f"

manifests/function/clusterctl/replacements/versions.yaml

@@ -29,6 +29,16 @@ replacements:
       kind: Clusterctl
       name: clusterctl_init
     fieldrefs: ["{.images.infrastructure-metal3/kube-rbac-proxy}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-airshipctl
+    fieldref: "{.spec.capi_images.capm3.ipam-manager}"
+  target:
+    objref:
+      kind: Clusterctl
+      name: clusterctl_init
+    fieldrefs: ["{.images.infrastructure-metal3/ip-address-manager}"]
 # Replace cacpk versions
 - source:
     objref: