Skip to content
This repository was archived by the owner on Nov 1, 2022. It is now read-only.

Bump client-go to version 1.11 #1929

Merged
merged 7 commits into from
Apr 12, 2019
Merged

Bump client-go to version 1.11 #1929

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfb6d2d
Bump client-go to version 1.11
Apr 12, 2019
c8c57ee
Bump mergo to 0.3.7
Apr 12, 2019
65d11c6
Run dep ensure -update
Apr 12, 2019
42f0646
Switch to 2opremio/go-k8s-portforward
Apr 12, 2019
c9ea146
Go back to client-go's fake dynamic client
Apr 12, 2019
a632311
Port flux to client-go 1.11
Apr 12, 2019
8bd324a
Update generated code
Apr 12, 2019
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
Prev Previous commit
Next Next commit
Port flux to client-go 1.11
  • Loading branch information
Alfonso Acosta committed Apr 12, 2019
commit a632311d1c2491afdcc10e6b5ec98af50b161967
2 changes: 1 addition & 1 deletion cmd/fluxd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func main() {
}

sshKeyRing, err = kubernetes.NewSSHKeyRing(kubernetes.SSHKeyRingConfig{
SecretAPI: clientset.Core().Secrets(string(namespace)),
SecretAPI: clientset.CoreV1().Secrets(string(namespace)),
SecretName: *k8sSecretName,
SecretVolumeMountPath: *k8sSecretVolumeMountPath,
SecretDataKey: *k8sSecretDataKey,
Expand Down
2 changes: 1 addition & 1 deletion ...ations/client/clientset/versioned/typed/flux.weave.works/v1beta1/fake/fake_helmrelease.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (c *FakeHelmReleases) DeleteCollection(options *v1.DeleteOptions, listOptio
// Patch applies the patch and returns the patched helmRelease.
func (c *FakeHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.HelmRelease, err error) {
obj, err := c.Fake.
Invokes(testing.NewPatchSubresourceAction(helmreleasesResource, c.ns, name, data, subresources...), &v1beta1.HelmRelease{})
Invokes(testing.NewPatchSubresourceAction(helmreleasesResource, c.ns, name, types.ApplyPatchType, data, subresources...), &v1beta1.HelmRelease{})

if obj == nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion .../versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/fake_fluxhelmrelease.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (c *FakeFluxHelmReleases) DeleteCollection(options *v1.DeleteOptions, listO
// Patch applies the patch and returns the patched fluxHelmRelease.
func (c *FakeFluxHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha2.FluxHelmRelease, err error) {
obj, err := c.Fake.
Invokes(testing.NewPatchSubresourceAction(fluxhelmreleasesResource, c.ns, name, data, subresources...), &v1alpha2.FluxHelmRelease{})
Invokes(testing.NewPatchSubresourceAction(fluxhelmreleasesResource, c.ns, name, types.ApplyPatchType, data, subresources...), &v1alpha2.FluxHelmRelease{})

if obj == nil {
return nil, err
Expand Down