Skip to content
This repository was archived by the owner on Mar 22, 2024. It is now read-only.

Commit 97676fd

Browse files
authored
Remove legacy v1beta1 CRDs (elastic#5029)
which removes support of OpenShift 3.11 and Kubernetes <1.16. - Remove legacy CRDs references in the docs - Remove OpenShift 3.11 from the supported versions - Update OperatorHub CSV minKubeVersion to 1.16 - Remove legacy CRDs generation from Makefile and manifest-gen - rm -rf config/crds/v1beta1 - rm -rf hack/manifest-gen/templatize - rm -f config/all-in-one.yaml - Remove manifest-gen test case for k8s 1.13 - Drop k8s <1.16 CRDs legacy support from manifest-gen
1 parent d9bd0ee commit 97676fd

40 files changed

+43
-103878
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ monitoring-secrets.json
3535

3636
# generated from merging multiple files in the Makefile
3737
config/operator.yaml
38-
config/operator-legacy.yaml
3938
config/crds.yaml
40-
config/crds-legacy.yaml
4139

4240
# ignore generated configuration
4341
config/eck.yaml

Makefile

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dependencies:
8888
# Generate code, CRDs and documentation
8989
ALL_V1_CRDS=config/crds/v1/all-crds.yaml
9090

91-
generate: tidy generate-crds-v1 generate-crds-v1beta1 generate-config-file generate-api-docs generate-notice-file
91+
generate: tidy generate-crds-v1 generate-config-file generate-api-docs generate-notice-file
9292

9393
tidy:
9494
go mod tidy
@@ -118,30 +118,6 @@ generate-crds-v1: go-generate controller-gen
118118
--set=nameOverride=$(OPERATOR_NAME) \
119119
--set=fullnameOverride=$(OPERATOR_NAME) > config/operator.yaml
120120

121-
122-
123-
generate-crds-v1beta1: go-generate controller-gen
124-
# Generate webhook manifest
125-
# Webhook definitions exist in both pkg/apis and pkg/controller/elasticsearch/validation
126-
$(CONTROLLER_GEN) webhook object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... paths=./pkg/controller/elasticsearch/validation/...
127-
# Generate manifests e.g. CRD, RBAC etc.
128-
$(CONTROLLER_GEN) crd:crdVersions=v1beta1 paths="./pkg/apis/..." output:crd:artifacts:config=config/crds/v1beta1/bases
129-
# apply patches to work around some CRD generation issues, and merge them into a single file
130-
kubectl kustomize config/crds/v1beta1/patches > config/crds/v1beta1/all-crds.yaml
131-
# generate a CRD only version without the operator manifests
132-
@ ./hack/manifest-gen/manifest-gen.sh -c -g --set=global.kubeVersion=1.12.0 > config/crds-legacy.yaml
133-
# generate the operator manifests
134-
@ ./hack/manifest-gen/manifest-gen.sh -g \
135-
--profile=global \
136-
--namespace=$(OPERATOR_NAMESPACE) \
137-
--set=global.kubeVersion=1.12.0 \
138-
--set=installCRDs=false \
139-
--set=telemetry.distributionChannel=all-in-one \
140-
--set=image.tag=$(IMG_VERSION) \
141-
--set=image.repository=$(BASE_IMG) \
142-
--set=nameOverride=$(OPERATOR_NAME) \
143-
--set=fullnameOverride=$(OPERATOR_NAME) > config/operator-legacy.yaml
144-
145121
generate-config-file:
146122
@hack/config-extractor/extract.sh
147123

@@ -177,13 +153,12 @@ unit: clean
177153
unit-xml: clean
178154
ECK_TEST_LOG_LEVEL=$(LOG_VERBOSITY) gotestsum --junitfile unit-tests.xml -- -cover ./pkg/... ./cmd/... $(TEST_OPTS)
179155

180-
# kubebuilder 2.3.1 comes with a 1.15 control plane and we rely on it for the k8s binaries
181156
integration: GO_TAGS += integration
182-
integration: clean generate-crds-v1beta1
157+
integration: clean generate-crds-v1
183158
ECK_TEST_LOG_LEVEL=$(LOG_VERBOSITY) go test -tags='$(GO_TAGS)' ./pkg/... ./cmd/... -cover $(TEST_OPTS)
184159

185160
integration-xml: GO_TAGS += integration
186-
integration-xml: clean generate-crds-v1beta1
161+
integration-xml: clean generate-crds-v1
187162
ECK_TEST_LOG_LEVEL=$(LOG_VERBOSITY) gotestsum --junitfile integration-tests.xml -- -tags='$(GO_TAGS)' -cover ./pkg/... ./cmd/... $(TEST_OPTS)
188163

189164
lint:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Current features:
1818
Supported versions:
1919

2020
* Kubernetes 1.18-1.22
21-
* OpenShift 3.11, 4.5-4.9
21+
* OpenShift 4.5-4.9
2222
* Elasticsearch, Kibana, APM Server: 6.8+, 7.1+
2323
* Enterprise Search: 7.7+
2424
* Beats: 7.0+

0 commit comments

Comments
 (0)