Release 2.4.3 rc1

.travis.yml

@@ -0,0 +1,34 @@
+dist: trusty
+sudo: required
+
+services:
+  - docker
+
+language: generic
+
+install:
+  - mkdir -p $HOME/goroot
+  - curl -L https://storage.googleapis.com/golang/go1.14.1.linux-amd64.tar.gz | tar -xz --strip-components=1 -C $HOME/goroot
+  - export GOROOT=$HOME/goroot
+  - export GOPATH=$HOME/gopath
+  - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
+  - mkdir -p $GOPATH/src/github.com/autonomy/conform
+  - rsync -az ${TRAVIS_BUILD_DIR}/ $GOPATH/src/github.com/autonomy/conform/
+  - export TRAVIS_BUILD_DIR=$GOPATH/src/github.com/autonomy/conform
+  - cd $GOPATH/src/github.com/autonomy/conform
+  - sudo rm -rf /etc/apt/sources.list.d
+  - sudo apt-get -y remove docker docker-engine
+  - sudo apt-get -y update
+  - sudo apt-get -y install apt-transport-https ca-certificates curl software-properties-common
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y install docker-ce
+  - echo "$DOCKER_TOKEN" | docker login --username "$DOCKER_USERNAME" --password-stdin
+
+script:
+  - make VERSION=latest
+
+after_success:
+  - docker run --volume=$(pwd):/out --entrypoint=cp logicmonitor/collectorset-controller:latest /coverage.txt /out
+  - bash <(curl -s https://codecov.io/bash)

Dockerfile

@@ -1,7 +1,7 @@
 FROM golang:1.14 as api
 WORKDIR /go/src/github.com/logicmonitor/k8s-collectorset-controller
 RUN apt-get update
-RUN apt-get -y install bsdtar
+RUN apt-get -y install --no-install-recommends bsdtar
 RUN go get github.com/golang/protobuf/protoc-gen-go
 RUN curl -L https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip | bsdtar -xf - --strip-components=1 -C /bin bin/protoc \
   && chmod +x /bin/protoc
@@ -11,7 +11,7 @@ RUN protoc -I proto proto/api.proto \
   --go_out=plugins=grpc:api --go_opt=paths=source_relative
 
 FROM golang:1.14-alpine as codegen
-RUN apk add --update git
+RUN apk add --no-cache git
 RUN go get github.com/kubernetes/code-generator/cmd/deepcopy-gen || true \
   && cd /go/src/github.com/kubernetes/code-generator \
   && git checkout remotes/origin/release-1.17 \
@@ -42,9 +42,7 @@ RUN cp coverage.txt /coverage.txt
 
 FROM alpine:3.6
 LABEL maintainer="LogicMonitor <argus@logicmonitor.com>"
-RUN apk --update add ca-certificates \
-  && rm -rf /var/cache/apk/* \
-  && rm -rf /var/lib/apk/*
+RUN apk --no-cache add ca-certificates
 WORKDIR /app
 COPY --from=api /go/src/github.com/logicmonitor/k8s-collectorset-controller/api/* /tmp/
 COPY --from=codegen /go/src/github.com/logicmonitor/k8s-collectorset-controller/pkg/apis/v1alpha2/zz_generated.deepcopy.go /tmp/

pkg/client/client.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	crv1alpha2 "github.com/logicmonitor/k8s-collectorset-controller/pkg/apis/v1alpha2"
+	log "github.com/sirupsen/logrus"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -21,8 +22,6 @@ import (
 
 const crdName = crv1alpha2.CollectorSetResourcePlural + "." + crv1alpha2.GroupName
 
-var preserveUnknownFields = true
-
 // Client represents the CollectorSet client.
 type Client struct {
 	Clientset              *clientset.Clientset
@@ -68,193 +67,27 @@ func NewForConfig(cfg *rest.Config) (*Client, *runtime.Scheme, error) {
 	return c, s, nil
 }
 
-func getCustomResourceDefinationSchema() *apiextensionsv1.JSONSchemaProps {
-	minValue := 0.0
-	minReplicas := 1.0
-	minGroupID := -1.0
-	defaultReplicas, _ := json.Marshal(1) //nolint:gosec
-
-	return &apiextensionsv1.JSONSchemaProps{
-		Description: "The collectorset specefication schema",
-		Type:        "object",
-		Required:    []string{"spec"},
-		Properties: map[string]apiextensionsv1.JSONSchemaProps{
-			"spec": {
-				Type:     "object",
-				Required: []string{"imageRepository", "imageTag", "imagePullPolicy", "replicas", "size", "clusterName"},
-				Properties: map[string]apiextensionsv1.JSONSchemaProps{
-					"imageRepository": {
-						Description: "The image repository of the collector container",
-						Type:        "string",
-						Default: &apiextensionsv1.JSON{
-							Raw: []byte("\"logicmonitor/collector\""),
-						},
-					},
-					"imageTag": {
-						Description: "The image tag of the collector container",
-						Type:        "string",
-						Default: &apiextensionsv1.JSON{
-							Raw: []byte("\"latest\""),
-						},
-					},
-					"imagePullPolicy": {
-						Description: "The image pull policy of the collector container",
-						Type:        "string",
-						Default: &apiextensionsv1.JSON{
-							Raw: []byte("\"Always\""),
-						},
-						Enum: []apiextensionsv1.JSON{
-							{
-								Raw: []byte("\"Always\""),
-							},
-							{
-								Raw: []byte("\"IfNotPresent\""),
-							},
-							{
-								Raw: []byte("\"Never\""),
-							},
-						},
-					},
-					"replicas": {
-						Description: "The number of collector replicas",
-						Type:        "integer",
-						Minimum:     &minReplicas,
-						Default: &apiextensionsv1.JSON{
-							Raw: defaultReplicas,
-						},
-					},
-					"size": {
-						Description: "The collector size. Available collector sizes: nano, small, medium, large, extra_large, double_extra_large",
-						Type:        "string",
-						Default: &apiextensionsv1.JSON{
-							Raw: []byte("\"nano\""),
-						},
-						Enum: []apiextensionsv1.JSON{
-							{
-								Raw: []byte("\"nano\""),
-							},
-							{
-								Raw: []byte("\"small\""),
-							},
-							{
-								Raw: []byte("\"medium\""),
-							},
-							{
-								Raw: []byte("\"large\""),
-							},
-							{
-								Raw: []byte("\"extra_large\""),
-							},
-							{
-								Raw: []byte("\"double_extra_large\""),
-							},
-						},
-					},
-					"clusterName": {
-						Description: "The clustername of the collector",
-						Type:        "string",
-					},
-					"groupID": {
-						Description: "The groupId of the collector",
-						Type:        "integer",
-						Minimum:     &minGroupID,
-					},
-					"escalationChainID": {
-						Description: "The escalation chain Id of the collectors",
-						Type:        "integer",
-						Minimum:     &minValue,
-					},
-					"collectorVersion": {
-						Description: "The collector version (Fractional numbered version is invalid. For ex: 29.101 is invalid, correct input is 29101)",
-						Type:        "integer",
-						Minimum:     &minValue,
-					},
-					"labels": {
-						Description: "The Labels of the collector",
-						Type:        "object",
-						AdditionalProperties: &apiextensionsv1.JSONSchemaPropsOrBool{
-							Schema: &apiextensionsv1.JSONSchemaProps{
-								Type: "string",
-							},
-						},
-					},
-					"annotations": {
-						Description: "The Annotations of the collector",
-						Type:        "object",
-						AdditionalProperties: &apiextensionsv1.JSONSchemaPropsOrBool{
-							Schema: &apiextensionsv1.JSONSchemaProps{
-								Type: "string",
-							},
-						},
-					},
-					"useEA": {
-						Description: "Flag to opt for EA collector versions",
-						Type:        "boolean",
-					},
-					"proxyURL": {
-						Description: "The Http/Https proxy url of the collector",
-						Type:        "string",
-					},
-					"secretName": {
-						Description: "The Secret resource name of the collector",
-						Type:        "string",
-					},
-					"statefulsetspec": {
-						Description:            "The collector StatefulSet specification for customizations",
-						Type:                   "object",
-						XPreserveUnknownFields: &preserveUnknownFields,
-						Properties: map[string]apiextensionsv1.JSONSchemaProps{
-							"template": {
-								Type: "object",
-								Properties: map[string]apiextensionsv1.JSONSchemaProps{
-									"spec": {
-										Type: "object",
-										Properties: map[string]apiextensionsv1.JSONSchemaProps{
-											"nodeSelector": {
-												Type: "object",
-												AdditionalProperties: &apiextensionsv1.JSONSchemaPropsOrBool{
-													Schema: &apiextensionsv1.JSONSchemaProps{
-														Type: "string",
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-					"policy": {
-						Type: "object",
-						Properties: map[string]apiextensionsv1.JSONSchemaProps{
-							"distributionStrategy": {
-								Description: "Distribution strategy to provide collector ID to the client requests from available running collectors",
-								Type:        "string",
-								Default: &apiextensionsv1.JSON{
-									Raw: []byte("\"RoundRobin\""),
-								},
-							},
-							"orchestrator": {
-								Description: "The container orchestration platform designed to automate the deployment, scaling, and management of containerized applications",
-								Type:        "string",
-								Default: &apiextensionsv1.JSON{
-									Raw: []byte("\"Kubernetes\""),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
+func getCustomResourceDefinationSchema() (*apiextensionsv1.JSONSchemaProps, error) {
+	schema := &apiextensionsv1.JSONSchemaProps{}
+	err := json.Unmarshal([]byte(schemaStr), schema)
+	if err != nil {
+		log.Errorf("Failed to parse schema definition: %v: %v", err, schemaStr)
+		return nil, fmt.Errorf("failed to parse schema definition: %w: %v", err, schemaStr)
 	}
+	log.Debugf("Unmarshaled schema: %v", schema)
+	return schema, nil
 }
 
 // CreateCustomResourceDefinition creates the CRD for collectors.
 // nolint: gocyclo
 func (c *Client) CreateCustomResourceDefinition() (*apiextensionsv1.CustomResourceDefinition, error) {
 	schema := &apiextensionsv1.CustomResourceValidation{}
 	preserveUnknownFields := true
-	schema.OpenAPIV3Schema = getCustomResourceDefinationSchema()
+	var err error
+	schema.OpenAPIV3Schema, err = getCustomResourceDefinationSchema()
+	if err != nil {
+		return nil, err
+	}
 	crd := &apiextensionsv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: crdName,
@@ -264,6 +97,11 @@ func (c *Client) CreateCustomResourceDefinition() (*apiextensionsv1.CustomResour
 			Names: apiextensionsv1.CustomResourceDefinitionNames{
 				Plural: crv1alpha2.CollectorSetResourcePlural,
 				Kind:   reflect.TypeOf(crv1alpha2.CollectorSet{}).Name(),
+				ShortNames: []string{
+					// cs is default shortname in kubernetes for ComponentStatuses, it is deprecated from 1.19+,
+					// when they remove it, we can use cs shortname here
+					"lmcs",
+				},
 			},
 			Scope: apiextensionsv1.NamespaceScoped,
 			Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
@@ -289,7 +127,7 @@ func (c *Client) CreateCustomResourceDefinition() (*apiextensionsv1.CustomResour
 		},
 	}
 
-	_, err := c.APIExtensionsClientset.ApiextensionsV1().CustomResourceDefinitions().Create(crd)
+	_, err = c.APIExtensionsClientset.ApiextensionsV1().CustomResourceDefinitions().Create(crd)
 	if err != nil {
 		if apierrors.IsAlreadyExists(err) {
 			if err1 := c.updateCRD(crd); err1 != nil {