Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

use new dynamic client #80

Merged
merged 5 commits into from
Sep 7, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 44 additions & 84 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,24 @@ required = [

[[constraint]]
name = "k8s.io/client-go"
version = "~6.0"
version = "8.0.0"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.9.9"
version = "kubernetes-1.11.0"

[[constraint]]
name = "k8s.io/code-generator"
version = "kubernetes-1.9.9"
version = "kubernetes-1.11.0"

[[override]]
name = "github.com/json-iterator/go"
version = "1.1.4" # as used by apimachinery@kubernetes-1.9.9
version = "1.1.5" # same minor version track as used by apimachinery@kubernetes-1.11.0

[prune]
Copy link
Contributor

Choose a reason for hiding this comment

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

I take it this is working for you? I only say that because I was running into all sorts of grouble getting code generation to work. See #79. I was able to get it to work adding the following to my GoPkg.toml:

[prune]
  go-tests = true
  unused-packages = true

  [[prune.project]]
    name = "k8s.io/code-generator"
    unused-packages = false

I was getting errors that the generator couldn't find the boilerplate.go.txt that comes with the code-generator repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Me too - There is no boilerplate.go.txt within the vendor code-generator repository, so I added it manually (which is wrong) to unblock myself. I forgot to point this out, thanks for the reminder!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me sync with @enisoc, and get back to you later. I believe your way of getting around this is better.

Copy link

Choose a reason for hiding this comment

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

@crimsonfaith91 I agree with the solution @rlguarino suggested. Can you try adding that?

@rlguarino Thanks for tracking that down!

Copy link
Contributor Author

@crimsonfaith91 crimsonfaith91 Aug 23, 2018

Choose a reason for hiding this comment

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

@enisoc Sure! I will include the [prune.project] section.

go-tests = true
unused-packages = true

[[prune.project]]
name = "k8s.io/code-generator"
unused-packages = false
2 changes: 1 addition & 1 deletion apis/metacontroller/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ type Hook struct {
}

type Webhook struct {
URL *string `json:"url,omitempty"`
URL *string `json:"url,omitempty"`
Timeout *metav1.Duration `json:"timeout,omitempty"`

Path *string `json:"path,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion apis/metacontroller/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions client/generated/clientset/internalclientset/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/generated/clientset/internalclientset/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/generated/clientset/internalclientset/scheme/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading