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

Add terraform support for additional CIDR blocks. #6693

Merged
merged 1 commit into from
Mar 28, 2019

Conversation

rdrgmnzs
Copy link
Contributor

Add terraform support for additional CIDR blocks now that support has been added to terraform. The relevant terraform docs can be found at https://www.terraform.io/docs/providers/aws/r/vpc_ipv4_cidr_block_association.html

Follow up PR for #5270

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 28, 2019
@justinsb
Copy link
Member

Thanks @rdrgmnzs

/approve
/lgtm

Do we want to cherry-pick this to 1.12?

The script I use is this one, BTW (you would git checkout -b release-1.12 then cherry 6693). But I'm also happy to do that!

#!/bin/bash -ex

set -o pipefail

PR=$1
BASE=`git rev-parse --abbrev-ref HEAD`

shas=`curl https://api.github.com/repos/kubernetes/kops/pulls/${PR}/commits  | jq -r .[].sha`

BRANCH="cherrypick_${PR}_${BASE}"

git checkout -b ${BRANCH}
for sha in $shas; do
 git cherry-pick $sha
done

git push ${USER}

cat <<EOF | hub pull-request -F - -b ${BASE}
Cherry pick of #${PR} onto ${BASE}

Cherry pick of #${PR}
EOF

git checkout ${BASE}

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 28, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, rdrgmnzs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2019
@rdrgmnzs
Copy link
Contributor Author

rdrgmnzs commented Mar 28, 2019

@justinsb since we're already looking at a kops 1.12-alpha.3 I say we should skip cherry picking this. It can just roll out in 1.13 when we have that as there's currently no open issues requesting it.

@k8s-ci-robot k8s-ci-robot merged commit e74127f into kubernetes:master Mar 28, 2019
k8s-ci-robot added a commit that referenced this pull request May 10, 2019
@rdrgmnzs rdrgmnzs deleted the additional-cidr-terraform branch August 9, 2019 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants