Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to klog in Juju and tunnel. #12534

Merged
merged 1 commit into from
Jan 20, 2021
Merged

Conversation

tlm
Copy link
Member

@tlm tlm commented Jan 20, 2021

This update respects the level of klog messages and passes them onto
loggo as such.

Also in this update is a change to k8s tunneling behaviour that waits
for the tunnel to pod to become ready before trying to tunnel. This also
adds a timeout for operations as to not fully block Juju.

Checklist

  • Requires a pylibjuju change
  • Added integration tests for the PR
  • Added or updated doc.go related to packages changed
  • Comments answer the question of why design decisions were made

QA steps

Bootstrap to several Kubernetes clusters such as kind and minikube and check for no error messages during bootstrap. Also try other juju commands like deploy and status.

Bug reference

https://bugs.launchpad.net/juju/+bug/1912348

Copy link
Member

@hpidcock hpidcock left a comment

Choose a reason for hiding this comment

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

LGTM, few little things

caas/kubernetes/provider/pod.go Show resolved Hide resolved
caas/kubernetes/tunnel.go Show resolved Hide resolved
caas/kubernetes/tunnel.go Show resolved Hide resolved
caas/kubernetes/tunnel.go Show resolved Hide resolved
@tlm tlm force-pushed the lp-1912348-socat-kube-proxy branch from 4ae662a to 4d2b8d9 Compare January 20, 2021 05:32
@tlm
Copy link
Member Author

tlm commented Jan 20, 2021

$$merge$$

@tlm tlm force-pushed the lp-1912348-socat-kube-proxy branch from 4d2b8d9 to f63884d Compare January 20, 2021 06:23
This update respects the level of klog messages and passes them onto
loggo as such.

Also in this update is a change to k8s tunneling behaviour that waits
for the tunnel to pod to become ready before trying to tunnel. This also
adds a timeout for operations as to not fully block Juju.

Addresses bug https://bugs.launchpad.net/juju/+bug/1912348
@tlm tlm force-pushed the lp-1912348-socat-kube-proxy branch from f63884d to 0635604 Compare January 20, 2021 11:39
@tlm
Copy link
Member Author

tlm commented Jan 20, 2021

$$merge$$

@jujubot jujubot merged commit 283e7bc into juju:2.9 Jan 20, 2021
jujubot added a commit that referenced this pull request Jan 25, 2021
#12550

There are conflicts in this, so we need to be careful about what's landed.

Most of the conflicts are in the go.mod/go.sum files.

2940934 (upstream/2.9, origin/2.9, 2.9) Merge pull request #12532 from SimonRichardson/charmhub-download-refresh-api
fe8e779 Merge pull request #12527 from SimonRichardson/charmstore-arch
20d95c6 Merge pull request #12546 from hmlanigan/case-sensative
8de1f74 Merge pull request #12542 from hmlanigan/no-charmhub-charm-by-revision
e4f02f8 Merge pull request #12544 from jujubot/increment-to-2.9-rc5
6162d5f Merge pull request #12543 from ycliuhw/2.8-into-2.9
81c7a77 Merge pull request #12541 from SimonRichardson/rename-charmhub-model-config
f2d798a Merge pull request #12540 from wallyworld/merge-2.8-20210121
0f28abb Merge pull request #12539 from manadart/2.9-lxd-default-root-disk-source
a8378b9 Merge pull request #12536 from achilleasa/2.9-fix-panic-when-serializing-proxier
1868862 Merge pull request #12517 from hmlanigan/snapstore-to-charmhub
f5ebff1 Merge pull request #12508 from manadart/2.9-remove-unused-retry
283e7bc Merge pull request #12534 from tlm/lp-1912348-socat-kube-proxy
3729449 Merge pull request #12526 from tlm/kube-config-multi
4a49a1a Merge pull request #12521 from SimonRichardson/charmhub-arch-charm-url
5035c50 Merge pull request #12523 from hmlanigan/new-refresh-resources-charmhub
7252d6f Merge pull request #12493 from manadart/2.9-login-spaces-discovery
b119871 Merge pull request #12522 from hmlanigan/no-info-find-download-with-older-controller
639114c Merge pull request #12530 from manadart/2.8-into-2.9
963fba8 Merge pull request #12529 from wallyworld/merge-2.8-20210119
9ffbd77 Merge pull request #12525 from tlm/k8s-log-id
65cfe5a Merge pull request #12512 from tlm/k8s-tunnel-2
daa4214 Merge pull request #12488 from SimonRichardson/fallback-architecture
8aa5f70 Merge pull request #12505 from hmlanigan/charmhub-hash-change
ec71db6 Merge pull request #12514 from wallyworld/fix-azure-bootstrap-custom-vnet
04f94d3 Merge pull request #12511 from benhoyt/aws-sdk-29-backport
22015bd Merge pull request #12509 from manadart/2.8-into-2.9
182c0b6 Merge pull request #12502 from ycliuhw/fix/ingress-class
6c4a40e Merge pull request #12496 from hpidcock/bootstrap-incluster
f1710b7 Merge pull request #12499 from hmlanigan/bug-1910591-cs-channel-resource
5fa2ca9 Merge pull request #12490 from benhoyt/merge-28-29-2
e80aed5 Merge pull request #12487 from hmlanigan/no-cs-required
2dc1434 Merge pull request #12485 from hmlanigan/relation-test-fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants