Skip to content

Commit

Permalink
Fix kubernetes-manifests/kustomization.yaml empty components issue (G…
Browse files Browse the repository at this point in the history
…oogleCloudPlatform#1436)

* Fix GoogleCloudPlatform#1435

* Avoid copying kustomization.yaml into base

Co-authored-by: Nim Jayawardena <[email protected]>
Co-authored-by: Nim Jayawardena <[email protected]>
  • Loading branch information
3 people committed Jan 18, 2023
1 parent 079d943 commit 6554195
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions hack/make-release-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ mk_istio_manifests() {
mk_kustomize_base() {
for file_to_copy in ./kubernetes-manifests/*.yaml
do
# Don't copy kustomization.yaml.
if [[ $file_to_copy == "./kubernetes-manifests/kustomization.yaml" ]]; then
continue
fi

cp ${file_to_copy} ./kustomize/base/

service_name="$(basename "${file_to_copy}" .yaml)"
Expand Down
4 changes: 2 additions & 2 deletions kubernetes-manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
- recommendationservice.yaml
- redis.yaml
- shippingservice.yaml
components:
# components:
# - ../kustomize/components/cymbal-branding
# - ../kustomize/components/google-cloud-operations
# - ../kustomize/components/memorystore
Expand All @@ -37,4 +37,4 @@ components:
# - ../kustomize/components/container-images-tag
# - ../kustomize/components/container-images-tag-suffix
# - ../kustomize/components/container-images-registry
# - ../kustomize/components/native-grpc-health-check
# - ../kustomize/components/native-grpc-health-check

0 comments on commit 6554195

Please sign in to comment.