feat: add container logs max size to the kubeone API #1644

nerdeveloper · 2021-11-23T13:05:25Z

What this PR does / why we need it:
This allow the user to set container logs maximum size on kubeone and defaults the container logs max size to 100Mi
Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1587

Special notes for your reviewer:

Does this PR introduce a user-facing change?:
YES

Ability to change container log maximum size. Currently defaults to 100Mi

kron4eg · 2021-11-23T14:40:20Z

/retest

pkg/state/context.go

nerdeveloper · 2021-11-24T11:24:32Z

/retest

pkg/cmd/config.go

pkg/apis/kubeone/v1beta1/types.go

… configurations

nerdeveloper · 2021-11-25T13:12:39Z

/retest

kron4eg · 2021-11-25T14:06:22Z

pkg/apis/kubeone/v1beta1/types.go

@@ -63,6 +63,14 @@ type KubeOneCluster struct {
 	AssetConfiguration AssetConfiguration `json:"assetConfiguration,omitempty"`
 	// RegistryConfiguration configures how Docker images are pulled from an image registry
 	RegistryConfiguration *RegistryConfiguration `json:"registryConfiguration,omitempty"`
+	// KubeletConfiguration configures the kubelet
+	KubeletConfiguration KubeletConfiguration `json:"kubeletConfiguration"`


please don't add this to v1beta1 API, only internal should be in place

I removed it but for some weird reason when I try to run update-codegen. it fails. I will try again and show you.

this is the issue I have when I remove it from v1beta1 API.

Try adding the types to the v1beta2 API and then re-run codegen.

pkg/cmd/config.go

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

pkg/apis/kubeone/config/config.go

pkg/cmd/config.go

pkg/containerruntime/docker_config.go

Co-authored-by: Artiom Diomin <artiom@hey.com>

Signed-off-by: nerdeveloper <odirionye@gmail.com>

xmudrii

Some more comments, but we are getting closer and closer.

pkg/apis/kubeone/v1beta2/types.go

pkg/apis/kubeone/config/config.go

pkg/cmd/config.go

pkg/containerruntime/docker_config_test.go

xmudrii · 2022-01-27T08:34:24Z

pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden

@@ -88,7 +88,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	"storage-driver": "overlay2",
 	"log-driver": "json-file",
 	"log-opts": {
-		"max-size": "100m"
+		"max-size": ""


Can you add the LoggingConfig to the function below?

kubeone/pkg/scripts/os_test.go

Lines 91 to 111 in 5f11dec

func genCluster(opts ...genClusterOpts) kubeone.KubeOneCluster {

cls := &kubeone.KubeOneCluster{

Versions: kubeone.VersionConfig{

Kubernetes: "1.17.4",

},

SystemPackages: &kubeone.SystemPackages{

ConfigureRepositories: true,

},

Proxy: kubeone.ProxyConfig{

HTTP: "http://http.proxy",

HTTPS: "http://https.proxy",

NoProxy: ".local",

},

}

for _, fn := range opts {

fn(cls)

}

return *cls

}

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Signed-off-by: nerdeveloper <odirionye@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>

kron4eg

/approve

kubermatic-bot · 2022-01-28T07:42:29Z

LGTM label has been added.

Git tree hash: 43a401d242195bb1d066a720d1fe5da997006e0b

kubermatic-bot · 2022-01-28T07:42:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg, nerdeveloper

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kron4eg]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

feat: add flag for container logs max size

eb88bf0

nerdeveloper added this to the KubeOne 1.4 milestone Nov 23, 2021

nerdeveloper requested a review from mate4st November 23, 2021 13:05

nerdeveloper self-assigned this Nov 23, 2021

kron4eg requested changes Nov 23, 2021

View reviewed changes

pkg/state/context.go Outdated Show resolved Hide resolved

kubermatic-bot assigned kron4eg Nov 23, 2021

feat: remove container log max size flag add it the kubeone api

f2f07eb

nerdeveloper changed the title ~~feat: add flag for container logs max size~~ feat: add container logs max size to the kubeone API Nov 24, 2021

nerdeveloper added 2 commits November 24, 2021 13:28

chore: update value of the container logs constructor

15974e9

chore: update

aa4bf83

mate4st suggested changes Nov 25, 2021

View reviewed changes

pkg/cmd/config.go Outdated Show resolved Hide resolved

pkg/apis/kubeone/v1beta1/types.go Outdated Show resolved Hide resolved

kubermatic-bot assigned mate4st Nov 25, 2021

refactor: add kubeconfig object to the kubeone API to support kubelet…

f069eb1

… configurations

kubermatic-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 25, 2021

nerdeveloper added 3 commits November 25, 2021 14:30

chore: update code gen

d3ee2b3

chore: update code gen

347693c

chore: sort goimports

649812a

kron4eg requested changes Nov 25, 2021

View reviewed changes

kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 26, 2021

nerdeveloper added 3 commits January 5, 2022 13:57

chore: update code

138b730

chore: merge code

05bde00

refactor: remove container log max size from old API and add to new one

99b9a48

nerdeveloper and others added 2 commits January 25, 2022 23:03

Update pkg/apis/kubeone/types.go

4553a37

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

chore: add docker CRI checks

213feed

nerdeveloper marked this pull request as draft January 26, 2022 11:30

kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 26, 2022

chore: rebase from master

79a4d58

nerdeveloper marked this pull request as ready for review January 26, 2022 11:45

kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 26, 2022

nerdeveloper added 2 commits January 26, 2022 16:00

chore: fix linting issue

67932d1

test: update go tests

f1bb451

kron4eg reviewed Jan 26, 2022

View reviewed changes

pkg/apis/kubeone/config/config.go Show resolved Hide resolved

pkg/cmd/config.go Outdated Show resolved Hide resolved

pkg/containerruntime/docker_config.go Show resolved Hide resolved

nerdeveloper and others added 5 commits January 26, 2022 17:40

Update pkg/cmd/config.go

78fea32

Co-authored-by: Artiom Diomin <artiom@hey.com>

chore: update values

8979029

chore: update values

8f3dee6

test: add test to check if log size parses

2340768

chore: fix lint issue

a7666d1

Signed-off-by: nerdeveloper <odirionye@gmail.com>

xmudrii reviewed Jan 27, 2022

View reviewed changes

nerdeveloper and others added 7 commits January 28, 2022 02:00

Update pkg/apis/kubeone/v1beta2/types.go

b0963e3

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Update pkg/apis/kubeone/config/config.go

430c5e0

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Update pkg/cmd/config.go

c0ecbb0

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Update pkg/containerruntime/docker_config_test.go

f24d3ad

Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>

chore: add suggestion and update tests

e991ba0

Signed-off-by: nerdeveloper <odirionye@gmail.com>

chore: fix linting

fa11297

Signed-off-by: nerdeveloper <odirionye@gmail.com>

Add boilerplate to docker_config_test.go

486f984

Signed-off-by: Artiom Diomin <kron82@gmail.com>

kron4eg approved these changes Jan 28, 2022

View reviewed changes

kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2022

kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 28, 2022

kubermatic-bot merged commit af7c971 into kubermatic:master Jan 28, 2022

kubermatic-bot added this to the KubeOne 1.4 milestone Jan 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add container logs max size to the kubeone API #1644

feat: add container logs max size to the kubeone API #1644

nerdeveloper commented Nov 23, 2021 •

edited

Loading

kron4eg commented Nov 23, 2021

nerdeveloper commented Nov 24, 2021

nerdeveloper commented Nov 25, 2021

kron4eg Nov 25, 2021

nerdeveloper Nov 25, 2021 •

edited

Loading

nerdeveloper Nov 25, 2021

xmudrii Jan 4, 2022

xmudrii left a comment

xmudrii Jan 27, 2022

kron4eg left a comment

kubermatic-bot commented Jan 28, 2022

kubermatic-bot commented Jan 28, 2022

	func genCluster(opts ...genClusterOpts) kubeone.KubeOneCluster {
	cls := &kubeone.KubeOneCluster{
	Versions: kubeone.VersionConfig{
	Kubernetes: "1.17.4",
	},
	SystemPackages: &kubeone.SystemPackages{
	ConfigureRepositories: true,
	},
	Proxy: kubeone.ProxyConfig{
	HTTP: "http://http.proxy",
	HTTPS: "http://https.proxy",
	NoProxy: ".local",
	},
	}

	for _, fn := range opts {
	fn(cls)
	}

	return *cls
	}

feat: add container logs max size to the kubeone API #1644

feat: add container logs max size to the kubeone API #1644

Conversation

nerdeveloper commented Nov 23, 2021 • edited Loading

kron4eg commented Nov 23, 2021

nerdeveloper commented Nov 24, 2021

nerdeveloper commented Nov 25, 2021

kron4eg Nov 25, 2021

Choose a reason for hiding this comment

nerdeveloper Nov 25, 2021 • edited Loading

Choose a reason for hiding this comment

nerdeveloper Nov 25, 2021

Choose a reason for hiding this comment

xmudrii Jan 4, 2022

Choose a reason for hiding this comment

xmudrii left a comment

Choose a reason for hiding this comment

xmudrii Jan 27, 2022

Choose a reason for hiding this comment

kron4eg left a comment

Choose a reason for hiding this comment

kubermatic-bot commented Jan 28, 2022

kubermatic-bot commented Jan 28, 2022

nerdeveloper commented Nov 23, 2021 •

edited

Loading

nerdeveloper Nov 25, 2021 •

edited

Loading