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

Add support for custom env vars in amazon-vpc-cni #8276

Merged
merged 2 commits into from
Feb 26, 2020
Merged

Add support for custom env vars in amazon-vpc-cni #8276

merged 2 commits into from
Feb 26, 2020

Conversation

rifelpet
Copy link
Member

@rifelpet rifelpet commented Jan 6, 2020 •
edited
Loading

There are a handful of env vars that users often want to set when using the AWS VPC CNI (amazonvpc):

https://github.com/aws/amazon-vpc-cni-k8s/tree/master#cni-configuration-variables

This opens them up through the cluster spec so they can be set more easily.

I was up in the air with the field name, env like in a pod spec's container, envVar, variables but settled with environment which is already used in exec hooks. I'm open to using a different name though. After discussion during office hours I went with env to match the pod spec's container field.

/hold since this relies on much of the test work of #8274, so waiting until that is merged

closes #7821

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 6, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

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 Jan 6, 2020
@rifelpet
Copy link
Member Author

rifelpet commented Jan 6, 2020

/test pull-kops-verify-govet

@rifelpet rifelpet changed the title Add support for custom env vars in AWS VPC CNI Add support for custom env vars in amazon-vpc-cni Jan 6, 2020
@rifelpet
Copy link
Member Author

rifelpet commented Jan 6, 2020 •
edited
Loading

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 6, 2020
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 8, 2020
@rifelpet
Copy link
Member Author

rifelpet commented Jan 9, 2020

/area api

@rifelpet
Copy link
Member Author

/test pull-kops-verify

1 similar comment
@rifelpet
Copy link
Member Author

/test pull-kops-verify

@rifelpet rifelpet mentioned this pull request Jan 31, 2020
Merged
@rifelpet
Copy link
Member Author

/hold for reimplementing with #8455

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 31, 2020
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 31, 2020
@rifelpet
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2020
@rifelpet rifelpet mentioned this pull request Feb 9, 2020
Closed
geojaz
geojaz reviewed Feb 9, 2020
View reviewed changes
Copy link
Member

@geojaz geojaz left a comment

Choose a reason for hiding this comment

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

Left some editorial suggestions. I'm 👍 on the substance

k8s/crds/kops.k8s.io_clusters.yaml Show resolved Hide resolved
k8s/crds/kops.k8s.io_clusters.yaml Show resolved Hide resolved
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml Show resolved Hide resolved
pkg/apis/kops/v1alpha2/networking.go Show resolved Hide resolved
geojaz
geojaz approved these changes Feb 26, 2020
View reviewed changes
Copy link
Member

@geojaz geojaz left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 26, 2020
@rifelpet
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit e07f847 into kubernetes:master Feb 26, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Feb 26, 2020
@rifelpet rifelpet mentioned this pull request Feb 26, 2020
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 27, 2020
@k8s-ci-robot
Merge pull request #8633 from rifelpet/automated-cherry-pick-of-#8276…
98d5e70 
…-origin-release-1.17

Automated cherry pick of #8276 and #8455: Add env API field to amazonvpc
@mikesplain mikesplain mentioned this pull request Mar 5, 2020
Merged
@rifelpet rifelpet deleted the aws-vpc-cni-env-vars branch August 6, 2020 02:50
@tomcruz17 tomcruz17 mentioned this pull request Mar 14, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geojaz geojaz geojaz approved these changes

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

Assignees

@geojaz geojaz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

Kops should stop updating AWS VPC CNI config after bootstrapping
3 participants
@rifelpet @k8s-ci-robot @geojaz