Skip to content
This repository has been archived by the owner on Oct 20, 2022. It is now read-only.

Commit

Permalink
Merge pull request #174 from erdrix/upgrade_operator-sdk
Browse files Browse the repository at this point in the history
Upgrade operator sdk
  • Loading branch information
Alexandre Guitton authored Feb 1, 2020
2 parents 18559ef + c977bac commit 120e6b2
Show file tree
Hide file tree
Showing 31 changed files with 7,503 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ orbs:
executors:
operator-build:
docker:
- image: orangeopensource/casskop-build:v0.9.0
- image: orangeopensource/casskop-build:v0.15.0-pr137
# Define jobs list
jobs:
# Build job, which build operator docker image (with operator-sdk build)
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ cassandra-operator.env
multi-casskop/multi-casskop.env
telepresence.log
build/_output
pkg/apis/db/v1alpha1/zz_generated.deepcopy.go
pkg/apis/db/*/zz_generated.deepcopy.go
multi-casskop/pkg/apis/db/v1alpha1/zz_generated.deepcopy.go
multi-casskop/build/_output
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GO_LINT_CMD := golint `go list ./... | grep -v /vendor/`
DEV_DIR := docker/circleci
APP_DIR := build/Dockerfile

OPERATOR_SDK_VERSION=v0.9.0
OPERATOR_SDK_VERSION=v0.15.0-pr137
# workdir
WORKDIR := /go/casskop

Expand Down Expand Up @@ -161,14 +161,15 @@ helm-package:
mv cassandra-operator-$(HELM_VERSION).tgz $(HELM_TARGET_DIR)
helm repo index $(HELM_TARGET_DIR)/

#
#@TODO : `opetator-sdk generate openapî` deprecated
.PHONY: generate
generate:
echo "Generate zzz-deepcopy objects"
operator-sdk version
operator-sdk generate k8s
operator-sdk generate openapi

#@TODO : `opetator-sdk generate openapî` deprecated
# Build casskop executable file in local go env
.PHONY: build
build:
Expand All @@ -182,6 +183,7 @@ ifdef PUSHLATEST
docker tag $(REPOSITORY):$(VERSION) $(REPOSITORY):latest
endif

#@TODO : `opetator-sdk generate openapî` deprecated
# Run a shell into the development docker image
docker-build: ## Build the Operator and it's Docker Image
echo "Generate zzz-deepcopy objects"
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ created
> You will need to manually install the crds beforehand
>
> ```console
> kubectl apply -f https://github.com/raw/Orange-OpenSource/casskop/master/deploy/crds/db_v1alpha1_cassandracluster_crd.yaml
> kubectl apply -f https://github.com/raw/Orange-OpenSource/casskop/master/deploy/crds/db.orange.com_cassandraclusters_crd.yaml
> ```
Add the Helm incubator repo if you do not already have it:
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12 as build
FROM golang:1.13 as build

ENV GO111MODULE=on

Expand Down
Loading

0 comments on commit 120e6b2

Please sign in to comment.