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.

Sign up for GitHub

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

Jump to bottom

Sync from upstream - Set "minimum" tag in Makefile #119

Merged
merged 2 commits into from
Nov 29, 2022
Merged

Sync from upstream - Set "minimum" tag in Makefile #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8d14a
Set "minimum" tag in Makefile
dhaiducek Nov 28, 2022
157e74e
Fix debug error
dhaiducek Nov 28, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
strategy:
fail-fast: false
matrix:
# The "minimum" tag is set in the Makefile
# KinD tags: https://hub.docker.com/r/kindest/node/tags
# (OCP 4.6 runs Kubernetes v1.19)
kind:
- 'v1.19.16'
- 'minimum'
- 'latest'
hosted_mode:
- "true"
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ HUB_KUBECONFIG_INTERNAL ?= $(PWD)/policy-addon-ctrl1.kubeconfig-internal
HUB_CLUSTER_NAME ?= policy-addon-ctrl1
MANAGED_CLUSTER_NAME ?= cluster1
KIND_VERSION ?= latest
ifneq ($(KIND_VERSION), latest)
# Set the Kind version tag
ifeq ($(KIND_VERSION), minimum)
KIND_ARGS = --image kindest/node:v1.19.16
else ifneq ($(KIND_VERSION), latest)
KIND_ARGS = --image kindest/node:$(KIND_VERSION)
else
KIND_ARGS =
Expand Down Expand Up @@ -293,7 +296,7 @@ e2e-debug: ## Collect debug logs from deployed clusters.
-KUBECONFIG=$(KIND_KUBECONFIG) kubectl -n open-cluster-management-agent-addon get pods
-KUBECONFIG=$(KIND_KUBECONFIG) kubectl get manifestwork --all-namespaces -o yaml

@echo "* Local controller log:""
@echo "* Local controller log:"
-cat build/_output/controller.log
@echo "* Container logs in namespace $(CONTROLLER_NAMESPACE):"
-@for POD in $(shell KUBECONFIG=$(KIND_KUBECONFIG) kubectl -n $(CONTROLLER_NAMESPACE) get pods -o name); do \
Expand Down