Skip to content

Commit b7b9c73

Browse files
clean up gateway CRD handling
- the CRD itself was duplicated - the makefile rule copied the file twice and then moved it to helm directory; do it in one shot - update docs to use kustomize invocation
1 parent 5d9f82e commit b7b9c73

File tree

3 files changed

+2
-1237
lines changed

3 files changed

+2
-1237
lines changed

Makefile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ CRD_OPTIONS ?= "crd:crdVersions=v1"
1818
# Whether to override AWS SDK models. set to 'y' when we need to build against custom AWS SDK models.
1919
AWS_SDK_MODEL_OVERRIDE ?= "n"
2020

21-
# Move Gateway API CRDs from bases directory to gateway directory
22-
MOVE_GATEWAY_CRDS = mv config/crd/bases/gateway.k8s.aws_* config/crd/gateway/
23-
24-
# Copy combined Gateway API CRDs from bases directory to helm directory
25-
COPY_GATEWAY_CRDS_TO_HELM = cp config/crd/gateway/gateway-crds.yaml helm/aws-load-balancer-controller/crds/gateway-crds.yaml
26-
2721
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
2822
ifeq (,$(shell go env GOBIN))
2923
GOBIN=$(shell go env GOPATH)/bin
@@ -67,12 +61,8 @@ manifests: controller-gen kustomize
6761
yq eval '.metadata.name = "webhook"' -i config/webhook/manifests.yaml
6862

6963
crds: manifests
70-
$(MOVE_GATEWAY_CRDS)
7164
$(KUSTOMIZE) build config/crd > helm/aws-load-balancer-controller/crds/crds.yaml
72-
$(KUSTOMIZE) build config/crd/gateway > config/crd/gateway/gateway-crds.yaml
73-
echo '---' > config/crd/gateway/gateway-crds.yaml
74-
$(KUSTOMIZE) build config/crd/gateway >> config/crd/gateway/gateway-crds.yaml
75-
$(COPY_GATEWAY_CRDS_TO_HELM)
65+
$(KUSTOMIZE) build config/crd/gateway > helm/aws-load-balancer-controller/crds/gateway-crds.yaml
7666
$(KUSTOMIZE) build config/crd/aga > helm/aws-load-balancer-controller/crds/aga-crds.yaml
7767

7868
# Run go fmt against code

0 commit comments

Comments
 (0)