Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CRD versions to v1beta1 #1782

Merged
merged 45 commits into from
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
263b543
Bump version v1betav1
thbkrkr Sep 24, 2019
37678bc
Merge remote-tracking branch 'upstream/master' into bump-version-v1beta1
thbkrkr Sep 25, 2019
110d8c5
Keep v1alpha1 apis
thbkrkr Sep 25, 2019
d624fa4
Missing refactoring
thbkrkr Sep 25, 2019
2ddf7f2
Add command to generate CRDs
thbkrkr Sep 25, 2019
1f3bd01
Update kubebuilder annotations
thbkrkr Sep 25, 2019
b629d1a
Fix JSON struct field tags
thbkrkr Sep 25, 2019
f7db6b6
Regenerate CRDs
thbkrkr Sep 25, 2019
715a1b2
make format
thbkrkr Sep 25, 2019
9b4c77f
Merge remote-tracking branch 'upstream/master' into bump-version-v1beta1
thbkrkr Sep 25, 2019
414ff96
Regenerate CRDs
thbkrkr Sep 25, 2019
a05eedb
Fix kibana annotation
thbkrkr Sep 25, 2019
50f5d51
Limit the description length for fields in OpenAPI Schema
thbkrkr Sep 25, 2019
cf5fb33
Regenerate CRDs
thbkrkr Sep 25, 2019
421ecc4
Missing merge
thbkrkr Sep 25, 2019
bdf482c
Update last compatible controller version
thbkrkr Sep 26, 2019
087c278
Merge remote-tracking branch 'upstream/master' into bump-version-v1beta1
thbkrkr Sep 26, 2019
e2f01f3
Regenerate CRDs with crd:maxDescLen=100
thbkrkr Sep 26, 2019
624853c
Regenerate CRDs with mcrd:axDescLen=0
thbkrkr Sep 26, 2019
f0724b7
go fmt
thbkrkr Sep 26, 2019
1e145eb
Make linter happy
thbkrkr Sep 26, 2019
5696ebc
Refactor controller version unit test
thbkrkr Sep 26, 2019
c64b76d
Remove v1alpha1
thbkrkr Sep 27, 2019
086dd7d
Generate CRDs with trivialVersions=true to support older k8s versions
thbkrkr Sep 27, 2019
4626a74
Regenerate CRDs
thbkrkr Sep 27, 2019
d947d93
Revert "Remove v1alpha1"
thbkrkr Sep 27, 2019
77cd79d
Rererereregenerate
thbkrkr Sep 27, 2019
990e8e9
Merge remote-tracking branch 'upstream/master' into bump-version-v1beta1
thbkrkr Sep 27, 2019
504fc88
Remove bad merge double comment
thbkrkr Sep 27, 2019
807c5dd
Missing refactoring
thbkrkr Sep 27, 2019
5aa9978
Remove podTemplate from the CRDs
thbkrkr Oct 1, 2019
5ebde8d
Merge remote-tracking branch 'upstream/master' into bump-version-v1beta1
thbkrkr Oct 1, 2019
aab5f43
Add go script to patch the CRDs
thbkrkr Oct 1, 2019
1083c68
Add license header
thbkrkr Oct 1, 2019
9f5173c
Update reconcile_test to use v1beta1
thbkrkr Oct 1, 2019
dd556d2
Fix APM Server associationStatus json tag
thbkrkr Oct 1, 2019
9422584
Parameterize the trivial versions
thbkrkr Oct 1, 2019
86c1ad5
Sync patch-crd module name
thbkrkr Oct 1, 2019
3ea3e64
Review's input
thbkrkr Oct 1, 2019
1e67eae
Comment why hack/patch-crd/main.go
thbkrkr Oct 1, 2019
5fb32b9
Fix categories kubebuilder annotation
thbkrkr Oct 1, 2019
a0b17d7
Improve naming and add comments
thbkrkr Oct 1, 2019
bfe7b16
Set UnknownControllerVersion to 0.0.0-UNKNOWN
thbkrkr Oct 1, 2019
443759c
go fmt and fix typo
thbkrkr Oct 1, 2019
8afc88d
Update common/annotation/controller_version_test.go
thbkrkr Oct 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ else
CONTROLLER_GEN=$(shell which controller-gen)
endif

# Produce CRDs that work back to Kubernetes <1.13 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true"

## -- Docker image

# on GKE, use GCR and GCLOUD_PROJECT
Expand Down Expand Up @@ -98,6 +101,9 @@ generate: controller-gen
# we use this in pkg/controller/common/license
go generate -tags='$(GO_TAGS)' ./pkg/... ./cmd/...
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/...
# Generate manifests e.g. CRD, RBAC etc.
anyasabo marked this conversation as resolved.
Show resolved Hide resolved
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./pkg/apis/..." output:crd:artifacts:config=config/crds
cd hack/patch-crd && go run main.go
$(MAKE) --no-print-directory generate-all-in-one
# TODO (sabo): reenable when new tag is cut and can work with the new repo path
# $(MAKE) --no-print-directory generate-api-docs
Expand Down
386 changes: 386 additions & 0 deletions config/crds/apm.k8s.elastic.co_apmservers.yaml

Large diffs are not rendered by default.

193 changes: 0 additions & 193 deletions config/crds/apm_v1alpha1_apmserver.yaml

This file was deleted.

53 changes: 53 additions & 0 deletions config/crds/elasticsearch.k8s.elastic.co_elasticsearches.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: elasticsearches.elasticsearch.k8s.elastic.co
spec:
additionalPrinterColumns:
- JSONPath: .status.health
name: health
type: string
- JSONPath: .status.availableNodes
description: Available nodes
name: nodes
type: integer
- JSONPath: .spec.version
description: Elasticsearch version
name: version
type: string
- JSONPath: .status.phase
name: phase
type: string
- JSONPath: .metadata.creationTimestamp
name: age
type: date
group: elasticsearch.k8s.elastic.co
names:
categories:
- elastic
kind: Elasticsearch
listKind: ElasticsearchList
plural: elasticsearches
shortNames:
- es
singular: elasticsearch
scope: Namespaced
subresources:
status: {}
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: false
- name: v1beta1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading