cluster: add option to specify busybox repository #1928

yehiyam · 2018-02-17T10:13:32Z

cluster: add option to specify busybox repository
add 2 options in EtcdCluster.spec:
busyboxRepository. Defaults to "busybox"
busyboxVersion. Defaults to "1.28.0-glibc"

for #1927

add 2 options in EtcdCluster.spec: busyboxRepository. Defaults to "busybox" busyboxVersion. Defaults to "1.28.0-glibc"

etcd-bot · 2018-02-17T10:14:01Z

Can one of the admins verify this patch?

etcd-bot · 2018-02-17T10:14:04Z

Can one of the admins verify this patch?

etcd-bot · 2018-02-17T10:14:07Z

Can one of the admins verify this patch?

hongchaodeng · 2018-02-17T20:48:11Z

pkg/apis/etcd/v1beta2/cluster.go

@@ -99,6 +101,15 @@ type ClusterSpec struct {

 	// etcd cluster TLS configuration
 	TLS *TLSPolicy `json:"TLS,omitempty"`
+
+	// busybox:latest uses uclibc which contains a bug that sometimes prevents name resolution


We shouldn't bloat the top level spec.

I would suggest adding these to PodPolicy.

@hongchaodeng OK. I'll do that.
Any other suggestions while i'm on it?

Move definition to PodPolicy Add unit-test

hongchaodeng · 2018-02-18T17:23:11Z

Since you changed the API, please also update the generated code: https://github.com/coreos/etcd-operator/blob/master/hack/k8s/codegen/README.md

After that I can enable the test on this PR.

yehiyam · 2018-02-18T21:11:08Z

@hongchaodeng Running the script did not change the generated code. Is it possible, or am I missing anything?

hongchaodeng · 2018-02-18T21:12:04Z

What's the output of running the command?

yehiyam · 2018-02-18T21:13:34Z

Generating deepcopy funcs
Generating clientset for etcd:v1beta2 at github.com/coreos/etcd-operator/pkg/generated/clientset
Generating listers for etcd:v1beta2 at github.com/coreos/etcd-operator/pkg/generated/listers
Generating informers for etcd:v1beta2 at github.com/coreos/etcd-operator/pkg/generated/informers

hongchaodeng · 2018-02-18T21:14:17Z

@etcd-bot ok to test

hongchaodeng · 2018-02-18T21:47:18Z

gofmt check failed:

gofmt checking failed:
/go/src/github.com/coreos/etcd-operator/pkg/util/k8sutil/k8sutils_test.go
diff -u /go/src/github.com/coreos/etcd-operator/pkg/util/k8sutil/k8sutils_test.go.orig /go/src/github.com/coreos/etcd-operator/pkg/util/k8sutil/k8sutils_test.go
--- /go/src/github.com/coreos/etcd-operator/pkg/util/k8sutil/k8sutils_test.go.orig	2018-02-18 21:16:38.840869766 +0000
+++ /go/src/github.com/coreos/etcd-operator/pkg/util/k8sutil/k8sutils_test.go	2018-02-18 21:16:38.840869766 +0000
@@ -1,23 +1,23 @@
 package k8sutil
 
 import (
-	"testing"
 	"fmt"
 	api "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
+	"testing"
 )
 
 func TestDefaultBusyboxImageName(t *testing.T) {
 	policy := &api.PodPolicy{}
-	image:=ImageNameBusybox(policy)
-	expected:= fmt.Sprintf("%s:%v",defaultBusyboxRepository , defaultBusyboxVersion)
+	image := ImageNameBusybox(policy)
+	expected := fmt.Sprintf("%s:%v", defaultBusyboxRepository, defaultBusyboxVersion)
 	if image != expected {
 		t.Errorf("expect image=%s, get=%s", expected, image)
 	}
 }
 
 func TestDefaultNilBusyboxImageName(t *testing.T) {
-	image:=ImageNameBusybox(nil)
-	expected:= fmt.Sprintf("%s:%v",defaultBusyboxRepository , defaultBusyboxVersion)
+	image := ImageNameBusybox(nil)
+	expected := fmt.Sprintf("%s:%v", defaultBusyboxRepository, defaultBusyboxVersion)
 	if image != expected {
 		t.Errorf("expect image=%s, get=%s", expected, image)
 	}
@@ -25,12 +25,12 @@
 
 func TestSetBusyboxImageName(t *testing.T) {
 	policy := &api.PodPolicy{
-		BusyboxVersion:"1.3.2",
-		BusyboxRepository:"myRepo/busybox",
+		BusyboxVersion:    "1.3.2",
+		BusyboxRepository: "myRepo/busybox",
 	}
-	image:=ImageNameBusybox(policy)
-	expected:= fmt.Sprintf("%s:%v","myRepo/busybox" , "1.3.2")
+	image := ImageNameBusybox(policy)
+	expected := fmt.Sprintf("%s:%v", "myRepo/busybox", "1.3.2")
 	if image != expected {
 		t.Errorf("expect image=%s, get=%s", expected, image)
 	}
-}
\ No newline at end of file
+}

fix formatting

hongchaodeng

The code looks good. Just some minor nits.

Almost dismiss the update. Please ping me when you made the change again. Thanks!

hongchaodeng · 2018-03-05T02:49:35Z

pkg/apis/etcd/v1beta2/cluster.go

@@ -143,6 +143,14 @@ type PodPolicy struct {
 	// etcd cluster.
 	// The "etcd.version" annotation is reserved for the internal use of the etcd operator.
 	Annotations map[string]string `json:"annotations,omitempty"`
+
+	// busybox:latest uses uclibc which contains a bug that sometimes prevents name resolution


Can you put these comment below on the BusyboxVersion comment? They are more related there.

hongchaodeng · 2018-03-05T02:49:53Z

pkg/util/k8sutil/k8sutil.go

@@ -66,7 +66,9 @@ const (
 	// AnnotationScope annotation name for defining instance scope. Used for specifing cluster wide clusters.
 	AnnotationScope = "etcd.database.coreos.com/scope"
 	//AnnotationClusterWide annotation value for cluster wide clusters.
-	AnnotationClusterWide = "clusterwide"
+	AnnotationClusterWide    = "clusterwide"
+	defaultBusyboxRepository = "busybox"


Add a blank line between public and private var?

hongchaodeng · 2018-03-05T02:50:39Z

pkg/util/k8sutil/k8sutil.go

@@ -134,6 +136,21 @@ func ImageName(repo, version string) string {
 	return fmt.Sprintf("%s:v%v", repo, version)
 }

+func ImageNameBusybox(policy *api.PodPolicy) string {


Make this method private by uncapitalize it imageName...
It is not used outside this package.

fix minor formatting issues

yehiyam · 2018-03-05T06:59:30Z

@hongchaodeng Fixed your comments.

hongchaodeng · 2018-03-05T19:12:35Z

pkg/apis/etcd/v1beta2/cluster.go

@@ -143,6 +143,14 @@ type PodPolicy struct {
 	// etcd cluster.
 	// The "etcd.version" annotation is reserved for the internal use of the etcd operator.
 	Annotations map[string]string `json:"annotations,omitempty"`
+
+	// busybox init container repository. default is busybox
+	BusyboxRepository string `json:"busyboxRepository,omitempty"`


Sorry to bother gain.
But after a second though, it would be better and easier to combine BusyboxRepository and BusyboxVersion into one field, e.g. BusyboxImage. Default to "busybox:1.28.0-glibc".

yehiyam · 2018-03-05T19:15:59Z

I think it is better with two properties, as it is the same as the etcd image and tag. If you still believe it is better to combine, I'll do it. No problem

…

On Mar 5, 2018 21:12, "Hongchao Deng" ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In pkg/apis/etcd/v1beta2/cluster.go <#1928 (comment)>: > @@ -143,6 +143,14 @@ type PodPolicy struct { // etcd cluster. // The "etcd.version" annotation is reserved for the internal use of the etcd operator. Annotations map[string]string `json:"annotations,omitempty"` + + // busybox init container repository. default is busybox + BusyboxRepository string `json:"busyboxRepository,omitempty"` Sorry to bother gain. But after a second though, it would be better and easier to combine BusyboxRepository and BusyboxVersion into one field, e.g. BusyboxImage. Default to "busybox:1.28.0-glibc". — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#1928 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AF2uY-s_f7XIelyvMM_c-4kOQMTFBFI7ks5tbY4lgaJpZM4SJQum> .

hongchaodeng · 2018-03-05T19:18:04Z

as it is the same as the etcd image and tag.

The etcd image is a special case. We expect that most of time users would only upgrade versions, aka tags. But that's not the case here.

yehiyam · 2018-03-05T19:19:23Z

Ok.

…

On Mar 5, 2018 21:18, "Hongchao Deng" ***@***.***> wrote: as it is the same as the etcd image and tag. The etcd image is a special case. We expect that most of time users would only upgrade versions, aka tags. But that's not the case here. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#1928 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AF2uY_oTPeev6Go09vXNYuMGAud_h3kWks5tbY9tgaJpZM4SJQum> .

hongchaodeng · 2018-03-05T20:28:14Z

LGTM

hongchaodeng · 2018-03-05T21:26:28Z

@fanminshi @hasbro17
Can one of you also review and then merge this?

fanminshi · 2018-03-05T22:05:00Z

pkg/util/k8sutil/k8sutil.go

+func imageNameBusybox(policy *api.PodPolicy) string {
+	// set defaults for busybox init container
+	image := defaultBusyboxImage
+


no need to have a newline here.
also is the following simpler?

if policy != nil && len(policy.BusyboxImage) > 0 { return policy.BusyboxImage } return defaultBusyboxImage

fanminshi · 2018-03-05T22:06:31Z

pkg/util/k8sutil/k8sutil.go

@@ -134,6 +136,16 @@ func ImageName(repo, version string) string {
 	return fmt.Sprintf("%s:v%v", repo, version)
 }

+func imageNameBusybox(policy *api.PodPolicy) string {
+	// set defaults for busybox init container


move the comment on top of imageNameBusybox?
and change the comment to be imageNameBusybox sets the default image for busybox init container

fix minor formatting issues

yehiyam · 2018-03-06T06:22:35Z

@fanminshi Updated the PR.

fanminshi · 2018-03-06T17:10:23Z

lgtm

herikwebb · 2019-07-15T19:16:47Z

@yehiyam @hongchaodeng are there any examples on how to use this to pass in an alternate repo for busybox?

yehiyam · 2019-07-15T19:27:24Z

@herikwebb you can look at an example in our helm chart

herikwebb · 2019-07-16T13:26:31Z

@yehiyam great, thanks!

cluster: add option to specify busybox repository

d0a2037

add 2 options in EtcdCluster.spec: busyboxRepository. Defaults to "busybox" busyboxVersion. Defaults to "1.28.0-glibc"

hongchaodeng reviewed Feb 17, 2018

View reviewed changes

cluster: add option to specify busybox repository

18735ab

Move definition to PodPolicy Add unit-test

cluster: add option to specify busybox repository

0454a55

fix formatting

hongchaodeng reviewed Mar 5, 2018

View reviewed changes

cluster: add option to specify busybox repository

adcdead

fix minor formatting issues

hongchaodeng reviewed Mar 5, 2018

View reviewed changes

change busybox repository and tag to one property

f91c3a3

fanminshi reviewed Mar 5, 2018

View reviewed changes

cluster: add option to specify busybox repository

d760038

fix minor formatting issues

hongchaodeng merged commit fffc646 into coreos:master Mar 6, 2018

yehiyam mentioned this pull request Dec 7, 2018

Unable to pull images in offline Kubernetes cluster #1927

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cluster: add option to specify busybox repository #1928

cluster: add option to specify busybox repository #1928

yehiyam commented Feb 17, 2018 •

edited

etcd-bot commented Feb 17, 2018

etcd-bot commented Feb 17, 2018

etcd-bot commented Feb 17, 2018

hongchaodeng Feb 17, 2018

yehiyam Feb 18, 2018

hongchaodeng commented Feb 18, 2018 •

edited

yehiyam commented Feb 18, 2018

hongchaodeng commented Feb 18, 2018

yehiyam commented Feb 18, 2018 •

edited

hongchaodeng commented Feb 18, 2018

hongchaodeng commented Feb 18, 2018 •

edited

hongchaodeng left a comment

hongchaodeng Mar 5, 2018

hongchaodeng Mar 5, 2018

hongchaodeng Mar 5, 2018

yehiyam commented Mar 5, 2018

hongchaodeng Mar 5, 2018

yehiyam commented Mar 5, 2018 via email

hongchaodeng commented Mar 5, 2018

yehiyam commented Mar 5, 2018 via email

hongchaodeng commented Mar 5, 2018

hongchaodeng commented Mar 5, 2018

fanminshi Mar 5, 2018

fanminshi Mar 5, 2018 •

edited

yehiyam commented Mar 6, 2018

fanminshi commented Mar 6, 2018

herikwebb commented Jul 15, 2019

yehiyam commented Jul 15, 2019

herikwebb commented Jul 16, 2019

cluster: add option to specify busybox repository #1928

cluster: add option to specify busybox repository #1928

Conversation

yehiyam commented Feb 17, 2018 • edited

etcd-bot commented Feb 17, 2018

etcd-bot commented Feb 17, 2018

etcd-bot commented Feb 17, 2018

hongchaodeng Feb 17, 2018

Choose a reason for hiding this comment

yehiyam Feb 18, 2018

Choose a reason for hiding this comment

hongchaodeng commented Feb 18, 2018 • edited

yehiyam commented Feb 18, 2018

hongchaodeng commented Feb 18, 2018

yehiyam commented Feb 18, 2018 • edited

hongchaodeng commented Feb 18, 2018

hongchaodeng commented Feb 18, 2018 • edited

hongchaodeng left a comment

Choose a reason for hiding this comment

hongchaodeng Mar 5, 2018

Choose a reason for hiding this comment

hongchaodeng Mar 5, 2018

Choose a reason for hiding this comment

hongchaodeng Mar 5, 2018

Choose a reason for hiding this comment

yehiyam commented Mar 5, 2018

hongchaodeng Mar 5, 2018

Choose a reason for hiding this comment

yehiyam commented Mar 5, 2018 via email

hongchaodeng commented Mar 5, 2018

yehiyam commented Mar 5, 2018 via email

hongchaodeng commented Mar 5, 2018

hongchaodeng commented Mar 5, 2018

fanminshi Mar 5, 2018

Choose a reason for hiding this comment

fanminshi Mar 5, 2018 • edited

Choose a reason for hiding this comment

yehiyam commented Mar 6, 2018

fanminshi commented Mar 6, 2018

herikwebb commented Jul 15, 2019

yehiyam commented Jul 15, 2019

herikwebb commented Jul 16, 2019

yehiyam commented Feb 17, 2018 •

edited

hongchaodeng commented Feb 18, 2018 •

edited

yehiyam commented Feb 18, 2018 •

edited

hongchaodeng commented Feb 18, 2018 •

edited

fanminshi Mar 5, 2018 •

edited