Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

66 fix multi cluster envs #100

Merged
merged 15 commits into from Feb 20, 2018

Conversation

dippynark
Copy link
Contributor

@dippynark dippynark commented Jan 31, 2018

What this PR does / why we need it: Multi cluster environements currently do not work with Tarmak. This PR fixes this by tagging subnets and instances appropriately so that clusters can function properly

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #66

Special notes for your reviewer:

Release note:

Fix multi cluster environments by supporting multiple clusters in a single VPC

@jetstack-bot jetstack-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 31, 2018
unzip /tmp/terraform-provider-awstag.zip && \
rm /tmp/terraform-provider-awstag.zip && \
mv terraform-provider-awstag /terraform/terraform-provider-awstag && \
chmod +x /terraform/terraform-provider-awstag
Copy link
Contributor

Choose a reason for hiding this comment

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

Before we can merge this we need to verify the binary using GPG. I think it would make sense to use airworthy and verify both our custom awstag provider and the terraform binary.

https://github.com/jetstack/airworthy

return nil
}

/*func resourceAwstagEC2TagUpdate(d *schema.ResourceData, meta interface{}) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we get rid of this comment

@simonswine
Copy link
Contributor

@dippynark can you take a look at my comments. Again also the verify boilterplate is failing because we don't have the LICENSE headers in the newly added files

@jetstack-ci-bot
Copy link
Contributor

@dippynark PR needs rebase

@jetstack-ci-bot jetstack-ci-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 13, 2018
Copy link
Contributor

@simonswine simonswine left a comment

Choose a reason for hiding this comment

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

Took a look at it, we are getting there. The whole PR needs a rebase. With #114 merging you should be able to run dep on your mac now

Maybe do one commit with all source code changes and another one cotaining the vendor/ + Gopkg.*. Makes it easier to review...

RUN curl -sL https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip > terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
airworthy -v download https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS -S https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig && \
cat terraform_${TERRAFORM_VERSION}_SHA256SUMS | grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip > terraform_${TERRAFORM_VERSION}_linux_amd64_SHA256SUMS && \
sha256sum -c terraform_${TERRAFORM_VERSION}_linux_amd64_SHA256SUMS && \
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no need for this, airworthy is checking the sha256 sum already

@@ -3,11 +3,17 @@ FROM alpine:3.6

RUN apk add --no-cache unzip curl

# install airworthy
COPY airworthy /usr/local/bin/airworthy
Copy link
Contributor

Choose a reason for hiding this comment

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

Airworthy should be download from github releases page and sha256sum check performed on it

See here: https://github.com/jetstack/tarmak/blob/master/terraform/amazon/kubernetes/templates/puppet_agent_user_data.yaml#L15

@jetstack-ci-bot jetstack-ci-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 19, 2018
@jetstack-bot jetstack-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 20, 2018
@simonswine
Copy link
Contributor

/approve

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 20, 2018
@dippynark
Copy link
Contributor Author

/lgtm

@jetstack-bot
Copy link
Collaborator

@dippynark: you cannot LGTM your own PR.

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@simonswine
Copy link
Contributor

/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2018
@jetstack-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dippynark, simonswine

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@jetstack-ci-bot
Copy link
Contributor

Automatic merge from submit-queue.

@jetstack-ci-bot jetstack-ci-bot merged commit 2f6bf32 into jetstack:master Feb 20, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix issues with multi cluster environments
4 participants