Cherry pick of #8038 onto release-1.14 #8047
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
|
/approve |
k8s-ci-robot
added
the
lgtm
|
/approve |
|
Well I can try too :-) /approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: granular-ryanbonham, justinsb, rdrgmnzs, zetaab 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 |
k8s-ci-robot
added
the
approved
kaldorn
pushed a commit
to getoutreach/kops
that referenced
this pull request
Jul 29, 2020
jaredallard
pushed a commit
to getoutreach/kops
that referenced
this pull request
Apr 14, 2021
Cache LaunchConfigurations On any given read operation for LCs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Cache AMIs AMIs can often be the same across different ASGs. Cache on each fetch for faster lookup later. Cache autoscaling groups On any given read operation for ASGs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Don't default adding MIMEBOUNDARY headers when a mixed instances policy is set Fixed "NeedsUpdate" status of nodes in mixedinstancegroups after rolling update kubernetes#7445 https://github.com/kubernetes/kops/pull/7445/files Upgrading k8s-srcdst to v.0.2.2 https://github.com/kubernetes/kops/pull/7388/files Align AWS and kops validation for spot allocation strategy https://github.com/kubernetes/kops/pull/7660/files add our calico changes calico-kube-controllers is required: https://github.com/kubernetes/kops/pull/7517/files calico-node patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-node.yaml calico-config patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-config.yaml calico-typha: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-typha.yaml calico-kube-controllers: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-kube-controllers.yaml Update aws_cloud.go Patching in capacity-optimized spot allocation strategy and updating AWS SDK Fix Handling of LaunchTemplate Versions for MixedInstancePolicy according to kubernetes#8047 Automated cherry pick of kubernetes#8261: Fix RollingUpdate behaviour when using LaunchTemplates for kubernetes#8567: Treat nil of LaunchTemplateSpecification.Version as from kubernetes#8808 Machine types update from - kubernetes#7947 A4-935 Make CircleCI build pipeline for kops fork [A4-935](https://outreach-io.atlassian.net/browse/A4-935) Adds a `.circleci/config.yml` to allow us to reproducibly build and upload assets for our fork of kops. This is used mainly to backport fixes and features into a 0.13-based branch. The management of this fork is complicated by the fact that kops configures nodes to go load the `nodeup` binary from a well known URL managed by vanilla upstream. We need to have our own S3 bucket with our own custom built binaries ready for download onto our nodes if we are to make changes to `nodeup` behavior, which is sometimes necesasry for the features we want to backport. So this CircleCI build goes through all the effort of building those assets and uploading them to S3. Tweak `Gopkg.toml` and run `make dep-ensure` Updates `Gopkg.toml` to attempt to work-around the fact that "goautoneg" no longer lives at bitbucket.org. The update process here was very finnicky. I had to make the update and delete some old generated files to get `make dep-ensure` to run to completion. Checks in the results of `make dep-ensure`. I suspect that last time there were changes to `Gopkg.toml` in [1] the changes to generated files were not fully committed and so we've partly lost the ability to build from this particular fork of kops. [1] 0984f14 Update gitignore preventing checkin of go-bindata vendor Upload to path without a `+` Upload a duplicate copy of our assets to a path that doesn't include a `+` sign. Although the S3 issue can be worked around by referencing the path as `%2B`, it seems `kops`, via the Go `url` package, will aggressively convert it back into a `+` and not re-encode it. The kops and Go behaviors would be fine if S3 followed the spec, but it doesn't. The easiest and safest work-around to this whole mess is to just not have any + signs in our path. Expose API Server flags needed for aws pod identities This adds the fields described in the documentation here: https://github.com/aws/amazon-eks-pod-identity-webhook/blob/master/SELF_HOSTED_SETUP.md#kubernetes-api-server-configuration Update k8s-1.12.yaml.template fix: calico Merge pull request #12 from getoutreach/fix-calico fix: calico
jaredallard
pushed a commit
to getoutreach/kops
that referenced
this pull request
Apr 14, 2021
Cache LaunchConfigurations On any given read operation for LCs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Cache AMIs AMIs can often be the same across different ASGs. Cache on each fetch for faster lookup later. Cache autoscaling groups On any given read operation for ASGs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Don't default adding MIMEBOUNDARY headers when a mixed instances policy is set Fixed "NeedsUpdate" status of nodes in mixedinstancegroups after rolling update kubernetes#7445 https://github.com/kubernetes/kops/pull/7445/files Upgrading k8s-srcdst to v.0.2.2 https://github.com/kubernetes/kops/pull/7388/files Align AWS and kops validation for spot allocation strategy https://github.com/kubernetes/kops/pull/7660/files add our calico changes calico-kube-controllers is required: https://github.com/kubernetes/kops/pull/7517/files calico-node patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-node.yaml calico-config patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-config.yaml calico-typha: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-typha.yaml calico-kube-controllers: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-kube-controllers.yaml Update aws_cloud.go Patching in capacity-optimized spot allocation strategy and updating AWS SDK Fix Handling of LaunchTemplate Versions for MixedInstancePolicy according to kubernetes#8047 Automated cherry pick of kubernetes#8261: Fix RollingUpdate behaviour when using LaunchTemplates for kubernetes#8567: Treat nil of LaunchTemplateSpecification.Version as from kubernetes#8808 Machine types update from - kubernetes#7947 A4-935 Make CircleCI build pipeline for kops fork [A4-935](https://outreach-io.atlassian.net/browse/A4-935) Adds a `.circleci/config.yml` to allow us to reproducibly build and upload assets for our fork of kops. This is used mainly to backport fixes and features into a 0.13-based branch. The management of this fork is complicated by the fact that kops configures nodes to go load the `nodeup` binary from a well known URL managed by vanilla upstream. We need to have our own S3 bucket with our own custom built binaries ready for download onto our nodes if we are to make changes to `nodeup` behavior, which is sometimes necesasry for the features we want to backport. So this CircleCI build goes through all the effort of building those assets and uploading them to S3. Tweak `Gopkg.toml` and run `make dep-ensure` Updates `Gopkg.toml` to attempt to work-around the fact that "goautoneg" no longer lives at bitbucket.org. The update process here was very finnicky. I had to make the update and delete some old generated files to get `make dep-ensure` to run to completion. Checks in the results of `make dep-ensure`. I suspect that last time there were changes to `Gopkg.toml` in [1] the changes to generated files were not fully committed and so we've partly lost the ability to build from this particular fork of kops. [1] 0984f14 Update gitignore preventing checkin of go-bindata vendor Upload to path without a `+` Upload a duplicate copy of our assets to a path that doesn't include a `+` sign. Although the S3 issue can be worked around by referencing the path as `%2B`, it seems `kops`, via the Go `url` package, will aggressively convert it back into a `+` and not re-encode it. The kops and Go behaviors would be fine if S3 followed the spec, but it doesn't. The easiest and safest work-around to this whole mess is to just not have any + signs in our path. Expose API Server flags needed for aws pod identities This adds the fields described in the documentation here: https://github.com/aws/amazon-eks-pod-identity-webhook/blob/master/SELF_HOSTED_SETUP.md#kubernetes-api-server-configuration Update k8s-1.12.yaml.template fix: calico Merge pull request #12 from getoutreach/fix-calico fix: calico
jaredallard
pushed a commit
to getoutreach/kops
that referenced
this pull request
Apr 19, 2021
Cache LaunchConfigurations On any given read operation for LCs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Cache AMIs AMIs can often be the same across different ASGs. Cache on each fetch for faster lookup later. Cache autoscaling groups On any given read operation for ASGs, warm a thread-safe cache if needed. Continue to use this cache until a write operation is performed. Don't default adding MIMEBOUNDARY headers when a mixed instances policy is set Fixed "NeedsUpdate" status of nodes in mixedinstancegroups after rolling update kubernetes#7445 https://github.com/kubernetes/kops/pull/7445/files Upgrading k8s-srcdst to v.0.2.2 https://github.com/kubernetes/kops/pull/7388/files Align AWS and kops validation for spot allocation strategy https://github.com/kubernetes/kops/pull/7660/files add our calico changes calico-kube-controllers is required: https://github.com/kubernetes/kops/pull/7517/files calico-node patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-node.yaml calico-config patch: https://github.com/getoutreach/kube_factory/blob/master/patches/calico/calico-config.yaml calico-typha: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-typha.yaml calico-kube-controllers: https://github.com/getoutreach/kube_factory/blob/master/addons/calico/calico-kube-controllers.yaml Update aws_cloud.go Patching in capacity-optimized spot allocation strategy and updating AWS SDK Fix Handling of LaunchTemplate Versions for MixedInstancePolicy according to kubernetes#8047 Automated cherry pick of kubernetes#8261: Fix RollingUpdate behaviour when using LaunchTemplates for kubernetes#8567: Treat nil of LaunchTemplateSpecification.Version as from kubernetes#8808 Machine types update from - kubernetes#7947 A4-935 Make CircleCI build pipeline for kops fork [A4-935](https://outreach-io.atlassian.net/browse/A4-935) Adds a `.circleci/config.yml` to allow us to reproducibly build and upload assets for our fork of kops. This is used mainly to backport fixes and features into a 0.13-based branch. The management of this fork is complicated by the fact that kops configures nodes to go load the `nodeup` binary from a well known URL managed by vanilla upstream. We need to have our own S3 bucket with our own custom built binaries ready for download onto our nodes if we are to make changes to `nodeup` behavior, which is sometimes necesasry for the features we want to backport. So this CircleCI build goes through all the effort of building those assets and uploading them to S3. Tweak `Gopkg.toml` and run `make dep-ensure` Updates `Gopkg.toml` to attempt to work-around the fact that "goautoneg" no longer lives at bitbucket.org. The update process here was very finnicky. I had to make the update and delete some old generated files to get `make dep-ensure` to run to completion. Checks in the results of `make dep-ensure`. I suspect that last time there were changes to `Gopkg.toml` in [1] the changes to generated files were not fully committed and so we've partly lost the ability to build from this particular fork of kops. [1] 0984f14 Update gitignore preventing checkin of go-bindata vendor Upload to path without a `+` Upload a duplicate copy of our assets to a path that doesn't include a `+` sign. Although the S3 issue can be worked around by referencing the path as `%2B`, it seems `kops`, via the Go `url` package, will aggressively convert it back into a `+` and not re-encode it. The kops and Go behaviors would be fine if S3 followed the spec, but it doesn't. The easiest and safest work-around to this whole mess is to just not have any + signs in our path. Expose API Server flags needed for aws pod identities This adds the fields described in the documentation here: https://github.com/aws/amazon-eks-pod-identity-webhook/blob/master/SELF_HOSTED_SETUP.md#kubernetes-api-server-configuration Update k8s-1.12.yaml.template fix: calico Merge pull request #12 from getoutreach/fix-calico fix: calico
oded7hoffman
pushed a commit
to spotinst/kubernetes-kops
that referenced
this pull request
Jan 23, 2023
…k_8038_release-1.14 Cherry pick of kubernetes#8038 onto release-1.14
oded7hoffman
pushed a commit
to spotinst/kubernetes-kops
that referenced
this pull request
Jan 23, 2023
…k_8038_release-1.14 Cherry pick of kubernetes#8038 onto release-1.14
oded7hoffman
pushed a commit
to spotinst/kubernetes-kops
that referenced
this pull request
Jan 23, 2023
…k_8038_release-1.14 Cherry pick of kubernetes#8038 onto release-1.14
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick of #8038