Skip to content

chore: Update Makefile and various tooling dependencies#1102

Merged
drivebyer merged 4 commits intoOT-CONTAINER-KIT:masterfrom
nashluffy:update-makefile
Oct 14, 2024
Merged

chore: Update Makefile and various tooling dependencies#1102
drivebyer merged 4 commits intoOT-CONTAINER-KIT:masterfrom
nashluffy:update-makefile

Conversation

@nashluffy
Copy link
Copy Markdown
Contributor

Description

Originally was getting an error from envtest, fix is in newer version of envtest, decided to update Makefile along the way to match newer operator-sdk versions (taken from the example project)

  • updates envtest from v0.7.0 -> v0.17.0
  • updates controller-gen from 0.4.1 -> 0.14.0
  • updates k8s version for envtest from 1.24 -> 1.30
  • adds kind as dependency, pinning at latest version v0.24.0
  • updates various bits (go-install-tool, dependency defintions, localbin) of the Makefile syntax to match that in newer operator-sdk versions

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • Tests have been added/modified and all tests pass.
  • Functionality/bugs have been confirmed to be unchanged or fixed.
  • I have performed a self-review of my own code.
  • Documentation has been updated or added where necessary.

Additional Context

make manifests was causing a panic in controller-gen, updating controller-gen to v0.14.0 removed the bug so make manifests is working again

Signed-off-by: Nash Luffman <nashluffman@gmail.com>
Signed-off-by: Nash Luffman <nashluffman@gmail.com>
Signed-off-by: Nash Luffman <nashluffman@gmail.com>
Signed-off-by: Nash Luffman <nashluffman@gmail.com>
# Image URL to use all building/pushing image targets
IMG ?= quay.io/opstree/redis-operator:v$(VERSION)
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

these are both deprecated flags in newer versions of controller-gen and don't produce meaningful differences

@codecov
Copy link
Copy Markdown

codecov bot commented Oct 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 45.67%. Comparing base (d121d86) to head (2b68ddd).
Report is 120 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff             @@
##           master    #1102       +/-   ##
===========================================
+ Coverage   35.20%   45.67%   +10.47%     
===========================================
  Files          19       20        +1     
  Lines        3213     2704      -509     
===========================================
+ Hits         1131     1235      +104     
+ Misses       2015     1387      -628     
- Partials       67       82       +15     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nashluffy nashluffy changed the title Update Makefile and various tooling dependencies chore: Update Makefile and various tooling dependencies Oct 14, 2024
Copy link
Copy Markdown
Collaborator

@drivebyer drivebyer left a comment

Choose a reason for hiding this comment

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

lgtm

@drivebyer drivebyer merged commit bee2bf7 into OT-CONTAINER-KIT:master Oct 14, 2024
nashluffy added a commit to nashluffy/redis-operator that referenced this pull request Oct 14, 2024
…-KIT#1102)

* update controller-gen to fix make manifests, update Makefile

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* update envtest version

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* fix path

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* add kind as dependency

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

---------

Signed-off-by: Nash Luffman <nashluffman@gmail.com>
Signed-off-by: mluffman <mluffman@thoughtmachine.net>
nashluffy added a commit to nashluffy/redis-operator that referenced this pull request Oct 16, 2024
…-KIT#1102)

* update controller-gen to fix make manifests, update Makefile

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* update envtest version

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* fix path

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* add kind as dependency

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

---------

Signed-off-by: Nash Luffman <nashluffman@gmail.com>
Signed-off-by: mluffman <mluffman@thoughtmachine.net>
nashluffy added a commit to nashluffy/redis-operator that referenced this pull request Oct 16, 2024
…-KIT#1102)

* update controller-gen to fix make manifests, update Makefile

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* update envtest version

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* fix path

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

* add kind as dependency

Signed-off-by: Nash Luffman <nashluffman@gmail.com>

---------

Signed-off-by: Nash Luffman <nashluffman@gmail.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.

2 participants