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

Merge latest upstream changes #411

Merged
merged 1,108 commits into from
Jan 26, 2023
Merged

Merge latest upstream changes #411

merged 1,108 commits into from
Jan 26, 2023

Conversation

AndiDog
Copy link

@AndiDog AndiDog commented Jan 26, 2023

Towards giantswarm/roadmap#1832

This basically does

git fetch upstream && git merge b7df7032c3efa43eeeab5fb126f1aadbf4a18f36

which was the latest commit in https://github.com/kubernetes-sigs/cluster-api-provider-aws/ when I started implementation. We must use a version newer than v2.0.2 since our fix kubernetes-sigs#3871 is not in any upstream release yet.

I changed our repo to leave the upstream Makefile unchanged. The difference to upstream is now only the CircleCI config:

λ git diff b7df7032c3efa43eeeab5fb126f1aadbf4a18f36 --stat
 .circleci/config.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

The pipeline is adapted to the multi-arch image build. I chose amd64/arm64 build architectures.

k8s-ci-robot and others added 30 commits October 12, 2022 08:03
…ot/github_actions/actions/checkout-3.1.0

build(deps): bump actions/checkout from 2 to 3.1.0
…ot/go_modules/golang.org/x/text-0.3.8

build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8
…ot/go_modules/github.com/spf13/cobra-1.6.0

build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0
…-tools

Bump controllers-tools to v0.10.0
normalize oidc configs to string values for comparison
Signed-off-by: Richard Case <richard.case@outlook.com>
…stance-refresh

add option for disabling instance refresh
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.8 to 0.4.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.3.8...v0.4.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Daniel Lipovetsky <3445370+dlipovetsky@users.noreply.github.com>
…reviewers_change

PROPOSAL: Maintainers and reviewer changes
…cile

Try to find and verify existing OIDC providers before we try to create a new one
…fixes

deleting additional vpc cni resources when disabled
switch to using interface func for consistency
Bumps [sigs.k8s.io/kustomize/api](https://github.com/kubernetes-sigs/kustomize) from 0.11.4 to 0.12.1.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@api/v0.11.4...api/v0.12.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind) from 0.14.0 to 0.16.0.
- [Release notes](https://github.com/kubernetes-sigs/kind/releases)
- [Commits](kubernetes-sigs/kind@v0.14.0...v0.16.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kind
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
fix: wrong EKS tag when upgrading older clusters
Bump golangci-lint in /hack/tools and aws-iam-authenticator
…ot/go_modules/golang.org/x/text-0.4.0

build(deps): bump golang.org/x/text from 0.3.8 to 0.4.0
…ot/go_modules/hack/tools/sigs.k8s.io/kind-0.16.0

build(deps): bump sigs.k8s.io/kind from 0.14.0 to 0.16.0 in /hack/tools
…ot/go_modules/sigs.k8s.io/kustomize/api-0.12.1

build(deps): bump sigs.k8s.io/kustomize/api from 0.11.4 to 0.12.1
Co-authored-by: Winnie Kwon <pydctw@gmail.com>
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.50.0 to 1.50.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.50.0...v1.50.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Richard Case <richard.case@suse.com>
AverageMarcus and others added 25 commits January 12, 2023 17:23
Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
capa fix hardcoded role arn for aws iam authenticator
Bumps golang from 1.19.4 to 1.19.5.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…926-arn-us-gov

Revert "capa fix hardcoded role arn for aws iam authenticator"
…ubnet_filters

Fail creation of machine pool if no subnets matching filters found
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.24.1...v1.25.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sigs.k8s.io/aws-iam-authenticator](https://github.com/kubernetes-sigs/aws-iam-authenticator) from 0.6.1 to 0.6.3.
- [Release notes](https://github.com/kubernetes-sigs/aws-iam-authenticator/releases)
- [Changelog](https://github.com/kubernetes-sigs/aws-iam-authenticator/blob/master/CHANGELOG.md)
- [Commits](kubernetes-sigs/aws-iam-authenticator@v0.6.1...v0.6.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/aws-iam-authenticator
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…gelog-sh-args

Introduce args in releasechangelog script
…ot/go_modules/github.com/onsi/gomega-1.25.0

build(deps): bump github.com/onsi/gomega from 1.24.1 to 1.25.0
…ot/go_modules/sigs.k8s.io/aws-iam-authenticator-0.6.3

build(deps): bump sigs.k8s.io/aws-iam-authenticator from 0.6.1 to 0.6.3
Bumps [github.com/sergi/go-diff](https://github.com/sergi/go-diff) from 1.2.0 to 1.3.1.
- [Release notes](https://github.com/sergi/go-diff/releases)
- [Commits](sergi/go-diff@v1.2.0...v1.3.1)

---
updated-dependencies:
- dependency-name: github.com/sergi/go-diff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/github.com/sergi/go-diff-1.3.1

build(deps): bump github.com/sergi/go-diff from 1.2.0 to 1.3.1
…ot/docker/golang-1.19.5

build(deps): bump golang from 1.19.4 to 1.19.5
…ess_only_iwg

Ignore EIGW deletion in case of unmanaged VPC
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.25.0...v1.26.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.80.1 to 2.90.0.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](kubernetes/klog@v2.80.1...v2.90.0)

---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Fix AWS CloudFormation dump after failed suit when there is no bootstrap cluster
…ot/go_modules/github.com/onsi/gomega-1.26.0

build(deps): bump github.com/onsi/gomega from 1.25.0 to 1.26.0
…ot/go_modules/k8s.io/klog/v2-2.90.0

build(deps): bump k8s.io/klog/v2 from 2.80.1 to 2.90.0
@AndiDog AndiDog requested a review from a team January 26, 2023 09:53
Copy link
Member

@fiunchinho fiunchinho left a comment

Choose a reason for hiding this comment

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

@AndiDog AndiDog merged commit ceca356 into main Jan 26, 2023
@AndiDog AndiDog deleted the merge-upstream branch January 26, 2023 16:23
@AndiDog AndiDog mentioned this pull request Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.