diff --git a/.github/workflows/stage-changes-for-kong.yaml b/.github/workflows/stage-changes-for-kong.yaml index a3707d7..dbe42b8 100644 --- a/.github/workflows/stage-changes-for-kong.yaml +++ b/.github/workflows/stage-changes-for-kong.yaml @@ -113,9 +113,16 @@ jobs: - name: Platform Team Kong Additions # The platform team has their own things to add to the final Kong configuration. # The platform-kong-base.yaml is a base file for any platform defaults. It will "win" over - # any settings in the domain teams Kong configurations. - # The platform/kong/.generated/kong.yaml is the final product and is stored in the repository - # Storing the generated file in the repo is intentional, it should help with PR reviews, transparency, and debugging. + # any settings in the domain teams Kong configurations. + # Then the platform adds in some objects like plugins, consumers, vaults, etc.. + # Also the platform/kong/patches.yaml is used to patch anything from the upstream + # team configurations + # And finally a tag is added to everything managed in this process to allow + # the deck tool to isolate what is managed here from entities that may be managed + # elsewhere or by other tools + # The platform/kong/.generated/kong.yaml is the final product and is stored in the repository. + # Storing the generated file in the repo is intentional, + # it should help with PR reviews, transparency, and debugging. run: | deck file merge \ .github/artifacts/kong/kong-combined.yaml \ @@ -123,7 +130,11 @@ jobs: platform/kong/consumers/* \ platform/kong/plugins/* \ platform/kong/vaults/* | \ - deck file patch -o platform/kong/.generated/kong.yaml platform/kong/patches.yaml + deck file patch \ + platform/kong/patches.yaml | + deck file add-tags \ + -o platform/kong/.generated/kong.yaml \ + "platform-repo-managed" - name: Upload Artifacts # Artifacts are the files that are built along the way of the pipeline but are not committed to the repo diff --git a/platform/kong/patches.yaml b/platform/kong/patches.yaml index f4f80aa..3815012 100644 --- a/platform/kong/patches.yaml +++ b/platform/kong/patches.yaml @@ -20,14 +20,3 @@ patches: secret_is_base64: false maximum_expiration: 86400 - # Tag all entities that are managed by the platform - # team process so we can isolate entities that may be - # created using other means on the system. For example, - # consumer credentials may be defined elsewhere and we - # don't want deck to sync or diff off them in this process - - selectors: - - $ - values: - tags: - - platform-repo-managed -