From c0ea9a387e27fcf971bc9bf9112de76e434ec65d Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Tue, 23 May 2023 11:12:18 -0700 Subject: [PATCH] fixes --- Dockerfile | 2 +- Makefile | 2 +- crd/crd.go | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec47ada6..6a79b541 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.0-alpine AS builder +FROM golang:1.20.0-alpine AS builder WORKDIR /app RUN apk --no-cache add git make diff --git a/Makefile b/Makefile index b7e4b617..da03b46b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ all: mod test build mod: $(GO) mod download tools: - $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0 + $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2 test: $(GO) test ./... -v lint: diff --git a/crd/crd.go b/crd/crd.go index ee320f96..a350639e 100644 --- a/crd/crd.go +++ b/crd/crd.go @@ -16,7 +16,7 @@ import ( const ( CRDPlural string = "databases" - CRDGroup string = "k8s.io" + CRDGroup string = "cloudnatix.com" // TODO(junm): fix this later. CRDVersion string = "v1" FullCRDName string = "databases." + CRDGroup StorageTypePattern string = `gp2|io1` @@ -39,8 +39,9 @@ func NewDatabaseCRD() *apiextv1.CustomResourceDefinition { Group: CRDGroup, Versions: []apiextv1.CustomResourceDefinitionVersion{ { - Name: CRDVersion, - Served: true, + Name: CRDVersion, + Served: true, + Storage: true, Schema: &apiextv1.CustomResourceValidation{ OpenAPIV3Schema: &apiextv1.JSONSchemaProps{ Type: "object",