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.

Sign up for GitHub

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

Use latest micrologger #79

Merged
merged 3 commits into from
Jan 4, 2021
Merged

Use latest micrologger #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6242246
Use latest micrologger
rossf7 Dec 21, 2020
1340478
Add fix for micrologger
rossf7 Dec 22, 2020
8c1b52e
Use micrologger v0.5.0
rossf7 Jan 4, 2021
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
56 changes: 28 additions & 28 deletions cmd/bootstrap/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@ func (r *runner) ensureCRDs(ctx context.Context, k8sClients k8sclient.Interface)

{
for _, crdName := range crds {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensuring %#q CRD", crdName))
r.logger.Debugf(ctx, "ensuring %#q CRD", crdName)

err := k8sClients.CRDClient().EnsureCreated(ctx, crd.LoadV1("application.giantswarm.io", crdName), backoff.NewMaxRetries(7, 1*time.Second))
if err != nil {
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensured %#q CRD exists", crdName))
r.logger.Debugf(ctx, "ensured %#q CRD exists", crdName)
}
}

Expand All @@ -238,7 +238,7 @@ func (r *runner) ensureCRDs(ctx context.Context, k8sClients k8sclient.Interface)
func (r *runner) ensureNamespace(ctx context.Context, k8sClients k8sclient.Interface) error {
namespace := "giantswarm"

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensuring namespace %#q", namespace))
r.logger.Debugf(ctx, "ensuring namespace %#q", namespace)

o := func() error {
{
Expand All @@ -249,7 +249,7 @@ func (r *runner) ensureNamespace(ctx context.Context, k8sClients k8sclient.Inter
}
_, err := k8sClients.K8sClient().CoreV1().Namespaces().Create(ctx, n, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("namespace %#q already exists", namespace))
r.logger.Debugf(ctx, "namespace %#q already exists", namespace)
// fall through
} else if err != nil {
return microerror.Mask(err)
Expand All @@ -275,15 +275,15 @@ func (r *runner) ensureNamespace(ctx context.Context, k8sClients k8sclient.Inter
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensured namespace %#q", namespace))
r.logger.Debugf(ctx, "ensured namespace %#q", namespace)

return nil
}

func (r *runner) ensurePriorityClass(ctx context.Context, k8sClients k8sclient.Interface) error {
priorityClassName := "giantswarm-critical"

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("creating priorityclass %#q", priorityClassName))
r.logger.Debugf(ctx, "creating priorityclass %#q", priorityClassName)

pc := &schedulingv1.PriorityClass{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -296,12 +296,12 @@ func (r *runner) ensurePriorityClass(ctx context.Context, k8sClients k8sclient.I

_, err := k8sClients.K8sClient().SchedulingV1().PriorityClasses().Create(ctx, pc, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("priorityclass %#q already exists", priorityClassName))
r.logger.Debugf(ctx, "priorityclass %#q already exists", priorityClassName)
// fall through
} else if err != nil {
return microerror.Mask(err)
} else {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("created priorityclass %#q", priorityClassName))
r.logger.Debugf(ctx, "created priorityclass %#q", priorityClassName)
}

return nil
Expand All @@ -315,7 +315,7 @@ func (r *runner) installAppCatalogs(ctx context.Context, k8sClients k8sclient.In
}

for name, url := range catalogs {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("creating %#q appcatalog cr", name))
r.logger.Debugf(ctx, "creating %#q appcatalog cr", name)

appCatalogCR := &v1alpha1.AppCatalog{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -336,20 +336,20 @@ func (r *runner) installAppCatalogs(ctx context.Context, k8sClients k8sclient.In
}
_, err = k8sClients.G8sClient().ApplicationV1alpha1().AppCatalogs().Create(ctx, appCatalogCR, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("%#q appcatalog CR already exists", appCatalogCR.Name))
r.logger.Debugf(ctx, "%#q appcatalog CR already exists", appCatalogCR.Name)
} else if err != nil {
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("created %#q appcatalog cr", name))
r.logger.Debugf(ctx, "created %#q appcatalog cr", name)
}

return nil
}

func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.Interface) error {
name := "chartmuseum-psp"
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensuring psp %#q", name))
r.logger.Debugf(ctx, "ensuring psp %#q", name)

o := func() error {
{
Expand All @@ -368,7 +368,7 @@ func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.
}
_, err := k8sClients.K8sClient().RbacV1().ClusterRoles().Create(ctx, clusterRole, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("clusterRole %#q already exists", name))
r.logger.Debugf(ctx, "clusterRole %#q already exists", name)
// fall through
} else if err != nil {
return microerror.Mask(err)
Expand All @@ -394,7 +394,7 @@ func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.
}
_, err := k8sClients.K8sClient().RbacV1().ClusterRoleBindings().Create(ctx, clusterRoleBinding, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("clusterRoleBinding %#q already exists", name))
r.logger.Debugf(ctx, "clusterRoleBinding %#q already exists", name)
// fall through
} else if err != nil {
return microerror.Mask(err)
Expand Down Expand Up @@ -426,7 +426,7 @@ func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.
}
_, err := k8sClients.K8sClient().PolicyV1beta1().PodSecurityPolicies().Create(ctx, psp, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("psp %#q already exists", name))
r.logger.Debugf(ctx, "psp %#q already exists", name)
// fall through
} else if err != nil {
return microerror.Mask(err)
Expand Down Expand Up @@ -468,7 +468,7 @@ func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.
}
_, err := k8sClients.K8sClient().NetworkingV1().NetworkPolicies(namespace).Create(ctx, np, metav1.CreateOptions{})
if apierrors.IsAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("networkpolicy %#q already exists", name))
r.logger.Debugf(ctx, "networkpolicy %#q already exists", name)
// fall through
} else if err != nil {
return microerror.Mask(err)
Expand All @@ -484,7 +484,7 @@ func (r *runner) ensureChartMuseumPSP(ctx context.Context, k8sClients k8sclient.
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensured psp %#q", name))
r.logger.Debugf(ctx, "ensured psp %#q", name)

return nil
}
Expand All @@ -493,7 +493,7 @@ func (r *runner) installChartMuseum(ctx context.Context, appTest apptest.Interfa
var err error

{
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("creating %#q app cr", chartMuseumName))
r.logger.Debugf(ctx, "creating %#q app cr", chartMuseumName)

apps := []apptest.App{
{
Expand All @@ -511,7 +511,7 @@ func (r *runner) installChartMuseum(ctx context.Context, appTest apptest.Interfa
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("created %#q app cr", chartMuseumName))
r.logger.Debugf(ctx, "created %#q app cr", chartMuseumName)
}

return nil
Expand Down Expand Up @@ -539,35 +539,35 @@ func (r *runner) installOperators(ctx context.Context, helmClient helmclient.Int
func (r *runner) installOperator(ctx context.Context, helmClient helmclient.Interface, name, version string) error {
var operatorTarballPath string
{
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("getting tarball URL for %#q", name))
r.logger.Debugf(ctx, "getting tarball URL for %#q", name)

operatorTarballURL, err := appcatalog.GetLatestChart(ctx, controlPlaneCatalogStorageURL, name, version)
if err != nil {
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("tarball URL is %#q", operatorTarballURL))
r.logger.Debugf(ctx, "tarball URL is %#q", operatorTarballURL)

r.logger.LogCtx(ctx, "level", "debug", "message", "pulling tarball")
r.logger.Debugf(ctx, "pulling tarball")

operatorTarballPath, err = helmClient.PullChartTarball(ctx, operatorTarballURL)
if err != nil {
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("tarball path is %#q", operatorTarballPath))
r.logger.Debugf(ctx, "tarball path is %#q", operatorTarballPath)
}

{
defer func() {
fs := afero.NewOsFs()
err := fs.Remove(operatorTarballPath)
if err != nil {
r.logger.LogCtx(ctx, "level", "error", "message", fmt.Sprintf("deletion of %#q failed", operatorTarballPath), "stack", fmt.Sprintf("%#v", err))
r.logger.Errorf(ctx, err, "deletion of %#q failed", operatorTarballPath)
}
}()

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("installing %#q", name))
r.logger.Debugf(ctx, "installing %#q", name)

// Set control plane operator values so chart-operator DNS settings are
// correct.
Expand All @@ -591,16 +591,16 @@ func (r *runner) installOperator(ctx context.Context, helmClient helmclient.Inte
input,
opts)
if helmclient.IsCannotReuseRelease(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("%#q already installed", name))
r.logger.Debugf(ctx, "%#q already installed", name)
return nil
} else if helmclient.IsReleaseAlreadyExists(err) {
r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("%#q already installed", name))
r.logger.Debugf(ctx, "%#q already installed", name)
return nil
} else if err != nil {
return microerror.Mask(err)
}

r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("installed %#q", name))
r.logger.Debugf(ctx, "installed %#q", name)
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/giantswarm/helmclient/v4 v4.1.0
github.com/giantswarm/k8sclient/v5 v5.0.0
github.com/giantswarm/microerror v0.3.0
github.com/giantswarm/micrologger v0.4.0
github.com/giantswarm/micrologger v0.5.0
github.com/giantswarm/to v0.3.0
github.com/spf13/afero v1.5.1
github.com/spf13/cobra v1.1.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ github.com/giantswarm/micrologger v0.3.1/go.mod h1:PjAgtcJ922ZMX/Aa05IPi0bdYvOj2
github.com/giantswarm/micrologger v0.3.3/go.mod h1:fkzQdDBC6HjJq4nllBDt6XB4t4yeVyhdHKblFX6QoMQ=
github.com/giantswarm/micrologger v0.4.0 h1:2EpnX86HKpqUNY8C4qbB2SzniB4bgES8Cd/mYrVyOrI=
github.com/giantswarm/micrologger v0.4.0/go.mod h1:xsD5laBXORMy/P34IHZMK0y/D1gTkYtASUL4gUm5KN4=
github.com/giantswarm/micrologger v0.5.0 h1:/f2knkyf4bZw3L5F48R7VENiEKPb3Sjnzrg46+Ja5vk=
github.com/giantswarm/micrologger v0.5.0/go.mod h1:J/jbt7A8eixqE40yq4JY8Hdbs/qeboe2FjHlq05UWjA=
github.com/giantswarm/to v0.3.0 h1:cEzMYkWLGI3cI8x3a0L3nPCQYJTb/cAaqcIPvxnDmpQ=
github.com/giantswarm/to v0.3.0/go.mod h1:RTRtw+Dyk6YqoiNBOGLO981BqhibtVwogdaFIMO1y/A=
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
Expand Down
7 changes: 3 additions & 4 deletions integration/test/bootstrap/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package bootstrap

import (
"context"
"fmt"
"testing"
"time"

Expand All @@ -23,7 +22,7 @@ func TestBootstrap(t *testing.T) {
ctx := context.Background()

{
config.Logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensuring %#q app CR is deployed", key.ChartMuseumAppName()))
config.Logger.Debugf(ctx, "ensuring %#q app CR is deployed", key.ChartMuseumAppName())

o := func() error {
app, err := config.K8sClients.G8sClient().ApplicationV1alpha1().Apps(key.Namespace()).Get(ctx, key.ChartMuseumAppName(), metav1.GetOptions{})
Expand All @@ -37,7 +36,7 @@ func TestBootstrap(t *testing.T) {
}

n := func(err error, t time.Duration) {
config.Logger.Log("level", "debug", "message", fmt.Sprintf("failed to get app CR status '%s': retrying in %s", helmclient.StatusDeployed, t), "stack", fmt.Sprintf("%v", err))
config.Logger.Errorf(ctx, err, "failed to get app CR status '%s': retrying in %s", helmclient.StatusDeployed, t)
}

b := backoff.NewConstant(20*time.Minute, 60*time.Second)
Expand All @@ -46,6 +45,6 @@ func TestBootstrap(t *testing.T) {
t.Fatalf("expected %#v got %#v", nil, err)
}

config.Logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("ensured %#q app CR is deployed", key.ChartMuseumAppName()))
config.Logger.Debugf(ctx, "ensured %#q app CR is deployed", key.ChartMuseumAppName())
}
}