diff --git a/Makefile b/Makefile index 850b3f4624..1c51659c49 100644 --- a/Makefile +++ b/Makefile @@ -493,16 +493,10 @@ set-manifest-image: $(info Updating kustomize image patch file for manager resource) sed -i'' -e 's@image: .*@image: '"${MANIFEST_IMG}:$(MANIFEST_TAG)"'@' ./config/default/capm3/manager_image_patch.yaml -.PHONY: set-manifest-image-ipam -set-manifest-image-ipam: - $(info Updating kustomize image patch file for IPAM controller) - sed -i'' -e 's@image: .*@image: '"${MANIFEST_IMG_IPAM}:$(MANIFEST_TAG_IPAM)"'@' ./config/ipam/image_patch.yaml - .PHONY: set-manifest-pull-policy set-manifest-pull-policy: $(info Updating kustomize pull policy file for manager resource) sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' ./config/default/capm3/manager_pull_policy_patch.yaml - sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' ./config/ipam/pull_policy_patch.yaml ## -------------------------------------- ## Deploying ## -------------------------------------- diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index c0a9a59d18..45277eeee1 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -5,4 +5,3 @@ labels: resources: - capm3 -- ../ipam diff --git a/config/ipam/image_patch.yaml b/config/ipam/image_patch.yaml deleted file mode 100644 index e572ca8033..0000000000 --- a/config/ipam/image_patch.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ipam-controller-manager - namespace: capm3-system -spec: - template: - spec: - containers: - # Change the value of image field below to your controller image URL - - image: quay.io/metal3-io/ip-address-manager:v1.9.1 - name: manager diff --git a/config/ipam/kustomization.yaml b/config/ipam/kustomization.yaml deleted file mode 100644 index cc228d152e..0000000000 --- a/config/ipam/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -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/v1.9.1/ipam-components.yaml - -patches: -- path: image_patch.yaml -- path: pull_policy_patch.yaml diff --git a/config/ipam/pull_policy_patch.yaml b/config/ipam/pull_policy_patch.yaml deleted file mode 100644 index 5fff9a2f46..0000000000 --- a/config/ipam/pull_policy_patch.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ipam-controller-manager - namespace: capm3-system -spec: - template: - spec: - containers: - - name: manager - imagePullPolicy: IfNotPresent \ No newline at end of file diff --git a/hack/verify-release.sh b/hack/verify-release.sh index 5b459fc6f9..bbbe38d8fb 100755 --- a/hack/verify-release.sh +++ b/hack/verify-release.sh @@ -696,6 +696,3 @@ verify_module_versions verify_module_group_versions verify_module_releases verify_vulnerabilities - -# capm3 specific checks -verify_ipam_manifests