Skip to content

[INF] Merge upstream keikoproj into fork#20

Open
jandersen-plaid wants to merge 26 commits intomasterfrom
jha-merge-governor-upstream
Open

[INF] Merge upstream keikoproj into fork#20
jandersen-plaid wants to merge 26 commits intomasterfrom
jha-merge-governor-upstream

Conversation

@jandersen-plaid
Copy link

The CHANGELOG contains all of the changes from the upstream side.

In general, there was very little that needed to be adjusted on the
Plaid side since the majority of the code was untouched.

The only notable callouts are:

  • runCommandWithContext does not take the initial context in the
    upstream version. We maintained our fork's version of taking the
    context supplied.
  • Updating the code to golang 1.25
  • The download location in the Dockerfile is not parameterized
    to take various architectures in the upstream. This behavior is in the
    Plaid fork and is maintained.

For features that come into the Plaid fork from the upstream, we notably
have:

  • Lots of dependency version updates.
  • Support for karpenter node labels.

Signed-off-by: Jack Andersen jandersen@plaid.com

dependabot bot and others added 26 commits April 18, 2024 17:47
* Update client-go for K8s 1.26

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>

* Update CODECOV token

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>

---------

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>
Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.33.0 to 1.33.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.33.0...v1.33.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…proj#158)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.19.0...v1.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.48.13 to 1.54.6.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.48.13...v1.54.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: update to go 1.24

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>

* fix: update GHA workflows to run on ubuntu-latest

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>

---------

Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4...v5)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.37.0 to 0.38.0.
- [Commits](golang/net@v0.37.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.38.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* karpenter nodes support

* removing asg check on karpenter nodes

* adding test for changes

* updating kubectl download path and version

* fix TestReapTaintedPositive

Signed-off-by: eramirez8 <estela_ramirez@intuit.com>

---------

Signed-off-by: eramirez8 <estela_ramirez@intuit.com>
Co-authored-by: eramirez8 <estela_ramirez@intuit.com>
Signed-off-by: eramirez8 <estela_ramirez@intuit.com>
Co-authored-by: eramirez8 <estela_ramirez@intuit.com>
The CHANGELOG contains all of the changes from the upstream side.

In general, there was very little that needed to be adjusted on the
Plaid side since the majority of the code was untouched.

The only notable callouts are:
* `runCommandWithContext` does not take the initial context in the
  upstream version. We maintained our fork's version of taking the
  context supplied.
* Updating the code to golang 1.25
* The download location in the `Dockerfile` is not parameterized
  to take various architectures in the upstream. This behavior is in the
  Plaid fork and is maintained.

For features that come into the Plaid fork from the upstream, we notably
have:
* Lots of dependency version updates.
* Support for karpenter node labels.

Signed-off-by: Jack Andersen <jandersen@plaid.com>
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.

4 participants