Stop importing the k8s.io/kubernetes module. #6411
Conversation
Signed-off-by: Michael Nelson <[email protected]>
✅ Deploy Preview for kubeapps-dev canceled.
|
pkg/kube/dockerconfig.go
Outdated
| ) | ||
|
|
||
| // The following is Copyright 2014 The Kubernetes Authors | ||
| // and icensed under the Apache License, Version 2.0. |
There was a problem hiding this comment.
I think we, perhaps, need to explicitly use the same copyright text, I was thinking sth more like:
Also, should we add the permalink instead of the link pointing to master? Not sure :S
// Including here instead of importing from k8s.io/kubernetes/credentialprovider
// since k8s.io/kubernetes is not supported for imports and leads to version issues.
// the following pieces of code have been extracted from
// https://github.com/kubernetes/kubernetes/blob/master/pkg/credentialprovider/provider.go
// and they are subject to the undermentioned license terms.
/*
Copyright 2014 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
There was a problem hiding this comment.
Great, will update.
pkg/kube/dockerconfig.go
Outdated
| @@ -0,0 +1,116 @@ | |||
| // Copyright 2019-2022 the Kubeapps contributors. | |||
There was a problem hiding this comment.
Yep, I've been removing the old OSL license files later (I don't think we personally need to add them to the root of the repo anyway, given that we upload them to the release artifacts and leave them there.. wdyt?)
There was a problem hiding this comment.
I don't think we personally need to add them to the root of the repo
The old ones? No, I don't think so. As for the current one (the one to be released), we need it just before tagging the release, this way it would end up in the release artifact.
Right after that... I believe we can safely remove it; in fact, that file no longer represents the current status of the project, as we might add/remove deps and, moreover, it is just a document to be embedded in a release artifact.
That said... I think it's easier for us to just remove it as part of the release process: remove the old one and add the new one.
There was a problem hiding this comment.
Right after that... I believe we can safely remove it; in fact, that file no longer represents the current status of the project, as we might add/remove deps and, moreover, it is just a document to be embedded in a release artifact.
Which is why I think it's more useful uploading it as a (separate) release artifact for that release, rather than temporarily including it in the repo. But IANAL.
YES!
haha - I was >< close from adding you as a reviewer yesterday just to have a second set of eyes on the change. Thanks for the input! I'll change locally now, still have to sort out CI failures. Thanks Antonio! |
Signed-off-by: Michael Nelson <[email protected]>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
license-eye has totally checked 1637 files.
| Valid | Invalid | Ignored | Fixed |
|---|---|---|---|
| 811 | 1 | 825 | 0 |
Click to see the invalid file list
- pkg/kube/dockerconfig.go
pkg/kube/dockerconfig.go
Outdated
| @@ -0,0 +1,133 @@ | |||
| // Copyright 2023 the Kubeapps contributors. | |||
There was a problem hiding this comment.
| // Copyright 2023 the Kubeapps contributors. | |
| // Copyright 2023 the Kubeapps contributors | |
| // | |
| // Licensed under the Apache License, Version 2.0 (the "License"); | |
| // you may not use this file except in compliance with the License. | |
| // You may obtain a copy of the License at | |
| // | |
| // http://www.apache.org/licenses/LICENSE-2.0 | |
| // | |
| // Unless required by applicable law or agreed to in writing, software | |
| // distributed under the License is distributed on an "AS IS" BASIS, | |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| // See the License for the specific language governing permissions and | |
| // limitations under the License. | |
| // Copyright 2023 the Kubeapps contributors. |
Signed-off-by: Michael Nelson <[email protected]>
Signed-off-by: Michael Nelson <[email protected]>
Signed-off-by: Michael Nelson <[email protected]>
Signed-off-by: Michael Nelson <[email protected]>
Description of the change
While trying to update other dependencies, I hit the issue that we're replacing certain k8s modules to be able to import k8s.io/kubernetes (even though that's not supported) but which conflict with versions required by other updates.
This PR removes the need for us to import from k8s.io/kubernetes (which we shouldn't be doing anyway), since we were only using it for the DockerCredential struct parsing - which I've moved into our own pkg/kube module.
Benefits
Less struggles with k8s version imports (no more replaces)
Possible drawbacks
Can't see any.