Skip to content

Embed CNI configmap in prow CI templates #1333

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

Merged
k8s-ci-robot merged 2 commits into from
Apr 28, 2021
Merged

Embed CNI configmap in prow CI templates #1333

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
04ea002
Embed CNI configmap in prow CI templates
Apr 23, 2021
19d8d73
Make ci-conformance LOCAL_ONLY default to true
Apr 26, 2021
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
2 changes: 1 addition & 1 deletion scripts/ci-conformance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ get_random_region() {
echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
}

export LOCAL_ONLY=${LOCAL_ONLY:-"false"}
export LOCAL_ONLY=${LOCAL_ONLY:-"true"}
Copy link
Copy Markdown
Contributor Author

@CecileRobertMichon CecileRobertMichon Apr 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chewong you might need to update any jobs that need to push conformance artifacts to an outside registry to have LOCAL_ONLY set to true.

Copy link
Copy Markdown
Contributor Author

@CecileRobertMichon CecileRobertMichon Apr 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kubernetes/test-infra#21953


if [[ "${LOCAL_ONLY}" == "true" ]]; then
export REGISTRY="localhost:5000/ci-e2e"
Expand Down
10 changes: 5 additions & 5 deletions templates/test/ci/cluster-template-prow-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: cluster.x-k8s.io/v1alpha4
kind: Cluster
metadata:
labels:
cni: ${CLUSTER_NAME}-crs-0
cni: ${CLUSTER_NAME}-calico
name: ${CLUSTER_NAME}
namespace: default
spec:
Expand Down Expand Up @@ -386,15 +386,15 @@ spec:
apiVersion: addons.cluster.x-k8s.io/v1alpha4
kind: ClusterResourceSet
metadata:
name: ${CLUSTER_NAME}-crs-0
name: ${CLUSTER_NAME}-calico
namespace: default
spec:
clusterSelector:
matchLabels:
cni: ${CLUSTER_NAME}-crs-0
cni: ${CLUSTER_NAME}-calico
resources:
- kind: ConfigMap
name: cni-${CLUSTER_NAME}-crs-0
name: cni-${CLUSTER_NAME}-calico
strategy: ApplyOnce
---
apiVersion: v1
Expand Down Expand Up @@ -4289,5 +4289,5 @@ metadata:
note: generated
labels:
type: generated
name: cni-${CLUSTER_NAME}-crs-0
name: cni-${CLUSTER_NAME}-calico
namespace: default
Loading