Skip to content

Commit

Permalink
Updated Operator SDK to v0.15.1
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
  • Loading branch information
jpkrohling committed Feb 5, 2020
1 parent dc0b118 commit 2c80e47
Show file tree
Hide file tree
Showing 13 changed files with 866 additions and 503 deletions.
40 changes: 40 additions & 0 deletions .ci/generate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash

OPENAPIGEN=openapi-gen
command -v ${OPENAPIGEN} > /dev/null
if [ $? != 0 ]; then
if [ -n ${GOPATH} ]; then
OPENAPIGEN="${GOPATH}/bin/openapi-gen"
fi
fi

# generate the CRD(s)
operator-sdk generate crds
RT=$?
if [ ${RT} != 0 ]; then
echo "Failed to generate CRDs."
exit ${RT}
fi

# revert the APIs that are not managed by us
for revert in deploy/crds/kafka.strimzi.io_kafkas_crd.yaml deploy/crds/kafka.strimzi.io_kafkausers_crd.yaml; do
if [ -f "${revert}" ]; then
rm "${revert}"
fi
done

# generate the schema validation (openapi) stubs
${OPENAPIGEN} --logtostderr=true -o "" -i ./pkg/apis/jaegertracing/v1 -O zz_generated.openapi -p ./pkg/apis/jaegertracing/v1 -h /dev/null -r "-"
RT=$?
if [ ${RT} != 0 ]; then
echo "Failed to generate the openapi (schema validation) stubs."
exit ${RT}
fi

# generate the Kubernetes stubs
operator-sdk generate k8s
RT=$?
if [ ${RT} != 0 ]; then
echo "Failed to generate the Kubernetes stubs."
exit ${RT}
fi
3 changes: 1 addition & 2 deletions .ci/lint.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/bin/bash

GOLINT=golint
EMPTY="[[:space:]]"

command -v ${GOLINT} > /dev/null
if [ $? != 0 ]; then
if [ -z ${GOPATH} ]; then
if [ -n ${GOPATH} ]; then
GOLINT="${GOPATH}/bin/golint"
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/base-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v1
- uses: jpkrohling/setup-operator-sdk@v1-release
with:
operator-sdk-version: v0.12.0
operator-sdk-version: v0.15.1

- name: "basic checks"
run: ./.ci/script.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: jpkrohling/setup-kubectl@v1-release
- uses: jpkrohling/setup-operator-sdk@v1-release
with:
operator-sdk-version: v0.12.0
operator-sdk-version: v0.15.1
- uses: actions/checkout@v1

- name: "setup docker"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1
- uses: jpkrohling/setup-operator-sdk@v1-release
with:
operator-sdk-version: v0.12.0
operator-sdk-version: v0.15.1
- name: "perform the release"
env:
GH_WRITE_TOKEN: ${{ secrets.GH_WRITE_TOKEN }}
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ES_OPERATOR_NAMESPACE ?= openshift-logging
ES_OPERATOR_BRANCH ?= release-4.3
PROMETHEUS_OPERATOR_TAG ?= v0.34.0
ES_OPERATOR_IMAGE ?= quay.io/openshift/origin-elasticsearch-operator:4.3
SDK_VERSION=v0.12.0
SDK_VERSION=v0.15.1
GOPATH ?= "$(HOME)/go"

LD_FLAGS ?= "-X $(VERSION_PKG).version=$(OPERATOR_VERSION) -X $(VERSION_PKG).buildDate=$(VERSION_DATE) -X $(VERSION_PKG).defaultJaeger=$(JAEGER_VERSION)"
Expand All @@ -48,7 +48,7 @@ format:
.PHONY: lint
lint:
@echo Linting...
@./.ci/lint.sh
@GOPATH=${GOPATH} @./.ci/lint.sh

.PHONY: security
security:
Expand Down Expand Up @@ -262,8 +262,7 @@ ingress:

.PHONY: generate
generate:
@${GO_FLAGS} operator-sdk generate openapi
@${GO_FLAGS} operator-sdk generate k8s
@GOPATH=${GOPATH} ./.ci/generate.sh

.PHONY: test
test: unit-tests e2e-tests
Expand All @@ -285,10 +284,11 @@ install-sdk:

.PHONY: install-tools
install-tools:
@${GO_FLAGS} go get \
@${GO_FLAGS} go install \
golang.org/x/lint/golint \
github.com/securego/gosec/cmd/gosec \
golang.org/x/tools/cmd/goimports
golang.org/x/tools/cmd/goimports \
k8s.io/kube-openapi/cmd/openapi-gen

.PHONY: install
install: install-sdk install-tools
Expand Down
594 changes: 360 additions & 234 deletions deploy/crds/jaegertracing.io_jaegers_crd.yaml

Large diffs are not rendered by default.

57 changes: 30 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.13

require (
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/go-openapi/spec v0.19.0
github.com/go-openapi/spec v0.19.4
github.com/googleapis/gnostic v0.3.1
github.com/mitchellh/go-homedir v1.1.0
github.com/onsi/ginkgo v1.10.3 // indirect
github.com/onsi/gomega v1.7.1 // indirect
github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
github.com/operator-framework/operator-sdk v0.12.0
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/operator-framework/operator-sdk v0.15.1
github.com/pkg/errors v0.8.1
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.5
Expand All @@ -25,31 +25,34 @@ require (
google.golang.org/grpc v1.24.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v11.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
sigs.k8s.io/controller-runtime v0.3.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20200204173128-addea2498afe
sigs.k8s.io/controller-runtime v0.4.0
)

// Pinned to kubernetes-1.15.4
// Pinned to kubernetes-1.16.2
replace (
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Loading

0 comments on commit 2c80e47

Please sign in to comment.