Upgrade controller-runtime and controller-gen #464
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
thisisnotashwin
force-pushed
the
upgrade-sdk-version
branch
2 times, most recently
from
2627c52
to
bd7527f
Compare
thisisnotashwin
requested review from
lkysow,
a team and
kschoche
and removed request for
a team
thisisnotashwin
commented
Mar 24, 2021
| @@ -2,30 +2,62 @@ domain: hashicorp.com | |||
| layout: go.kubebuilder.io/v2 | |||
| repo: github.com/hashicorp/consul-k8s | |||
| resources: | |||
There was a problem hiding this comment.
Changes in this file are side-effects of updating to Operator SDK 1.15
It changes the version from 3-alpha to 3 are requires additional fields per CRD
thisisnotashwin
commented
Mar 24, 2021
Comment on lines
+57
to
+58
| // +kubebuilder:validation:Type=object | ||
| // +kubebuilder:validation:Schemaless |
There was a problem hiding this comment.
This is due to kubernetes-sigs/controller-tools#528 (review) getting merged and now released in latest controller-tools version. It now supports object kind without breaking codegen
thisisnotashwin
commented
Mar 24, 2021
Comment on lines
+33
to
+39
| Update(context.Context, client.Object, ...client.UpdateOption) error | ||
| // UpdateStatus updates the state of just the object's status. | ||
| UpdateStatus(context.Context, runtime.Object, ...client.UpdateOption) error | ||
| UpdateStatus(context.Context, client.Object, ...client.UpdateOption) error | ||
| // Get retrieves an obj for the given object key from the Kubernetes Cluster. | ||
| // obj must be a struct pointer so that obj can be updated with the response | ||
| // returned by the Server. | ||
| Get(ctx context.Context, key client.ObjectKey, obj runtime.Object) error | ||
| Get(ctx context.Context, key client.ObjectKey, obj client.Object) error |
There was a problem hiding this comment.
This is because the interface of Reconciler and the controller have been updated to require client.Object and not runtime.Object which required the ConfigEntryResource interface to need an update
thisisnotashwin
commented
Mar 24, 2021
Comment on lines
-94
to
-101
| var proxyDefaultsSearch = ` description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting | ||
| format: byte | ||
| type: string | ||
| ` | ||
| var proxyDefaultsReplace = ` description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting | ||
| type: object | ||
| ` | ||
|
|
There was a problem hiding this comment.
No longer need to change the type on ProxyDefaults.config because of said PR
thisisnotashwin
force-pushed
the
upgrade-sdk-version
branch
from
bd7527f
to
d311a4f
Compare
- Change CRD api-version to v1 - Update PROJECT to v3 from v3-alpha - Update reconciler interface - Update crds to latest interface
thisisnotashwin
force-pushed
the
upgrade-sdk-version
branch
from
d311a4f
to
ac1c567
Compare
lkysow
approved these changes
Mar 25, 2021
| @@ -85,7 +85,7 @@ func TestValidateProxyDefault(t *testing.T) { | |||
| require.NoError(t, err) | |||
| s := runtime.NewScheme() | |||
| s.AddKnownTypes(GroupVersion, &ProxyDefaults{}, &ProxyDefaultsList{}) | |||
| client := fake.NewFakeClientWithScheme(s, c.existingResources...) | |||
| client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.existingResources...).Build() | |||
There was a problem hiding this comment.
bahaha!! indeed!!
controller/configentry_controller.go
Outdated
| @@ -86,10 +85,9 @@ type ConfigEntryController struct { | |||
| // internal state. | |||
| func (r *ConfigEntryController) ReconcileEntry( | |||
| crdCtrl Controller, | |||
| ctx context.Context, | |||
There was a problem hiding this comment.
let's make this the first argument. That seems pretty standard in go.
thisisnotashwin
force-pushed
the
upgrade-sdk-version
branch
from
8f50927
to
52c90e7
Compare
thisisnotashwin
force-pushed
the
upgrade-sdk-version
branch
from
52c90e7
to
53423ae
Compare
ndhanushkodi
pushed a commit
to ndhanushkodi/consul-k8s
that referenced
this pull request
Jul 9, 2021
Remove meshGateway.enableHealthChecks
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.
Changes proposed in this PR:
How I've tested this PR: https://app.circleci.com/pipelines/github/hashicorp/consul-helm/2661/workflows/511f1109-3595-4c39-a1c4-e654e0bd3b2e/jobs/9686
How I expect reviewers to test this PR: Code Review
Checklist: