Skip to content
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

⚠️ Change namespace for IPAM to fit changes #1993

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -480,16 +480,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
## --------------------------------------
Expand Down
1 change: 0 additions & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ labels:

resources:
- capm3
- ../ipam
12 changes: 0 additions & 12 deletions config/ipam/image_patch.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions config/ipam/kustomization.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions config/ipam/pull_policy_patch.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions hack/verify-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -634,32 +634,6 @@ verify_module_releases()
echo -e "Done\n"
}

verify_ipam_manifests()
{
# verify version in ipam manifests match the ipam module version
# NOTE: this is CAPM3 specific check
local ipam_version

echo "Verifying IPAM manifests match go.mod ..."

# shellcheck disable=SC2311
ipam_version="$(_module_get_version "ip-address-manager/api")"

declare -A ipam_manifests=(
[config/ipam/image_patch.yaml]="quay.io/metal3-io/ip-address-manager:${ipam_version}"
[config/ipam/kustomization.yaml]="https://github.com/metal3-io/ip-address-manager/releases/download/${ipam_version}/ipam-components.yaml"
)

for file in "${!ipam_manifests[@]}"; do
str="${ipam_manifests[${file}]}"
if ! grep -q -- "${str}" "${file}"; then
echo "ERROR: IPAM version in go.mod and manifests mismatch!"
fi
done

echo -e "Done\n"
}

_mutate_gomod_files_for_osv_scanner()
{
# mutate go.mod files to include go directive with exact patch version
Expand Down Expand Up @@ -728,6 +702,3 @@ verify_module_versions
verify_module_group_versions
verify_module_releases
verify_vulnerabilities

# capm3 specific checks
verify_ipam_manifests
Loading