chore(upstream): Port upstream changes from Netflix #2067

osoriano · 2023-09-18T22:24:49Z

Port over the first ~60 changes from the netflix branch. Only ~60 were taken to avoid backward-incompatible changes and to avoid too many changes.

Works with the latest deck UI (Attached a screenshot).

~~⚠️ Please DO NOT squash the commits in this PR when merging!~~

The porting of the commits have been done in the past, but ~600 changes are remaining

(cherry picked from commit 7465b7b82602b0efb4607c509b670d8653b96b65)

…chain to master Squashed commit of the following: commit 12b0c032bdbf9dd4e8158a729d74d376c82f5851 Author: Rob Fletcher <[email protected]> Date: Thu Sep 16 17:07:42 2021 -0700 fix(build): make oss build also use the same toolchain commit d87f0d89a9a81c8799e9fd7212d90007da48ed5e Author: Danny Thomas <[email protected]> Date: Fri Sep 17 09:40:58 2021 +1000 Nebula 8.1.0 commit 95f97331db80ac456586685694cf115f95f841f8 Author: Rob Fletcher <[email protected]> Date: Wed Sep 15 15:42:21 2021 -0700 fix(build): make sure we build with Java 11 (cherry picked from commit fd26a11b42ff67d9a666f1eb06db5642f9bba7bd)

Squashed commit of the following: commit b0232ff14b74f324a3564d917514e8df36a6c7f0 Author: Emily Burns <[email protected]> Date: Fri Sep 17 10:03:42 2021 -0700 feat(scheduler): tuneable batch size for checking (cherry picked from commit e7c767f16458fd9d679263afc416ba087a120f85)

Squashed commit of the following: commit 9ff29f3c0f414eb9c6ed440de88990850abbf0f0 Author: Rani <[email protected]> Date: Fri Sep 17 12:42:47 2021 -0700 fix(pr): moved branch selection logic commit de34f34a44e8815d3a421ef7018454e014721bea Author: Rani <[email protected]> Date: Thu Sep 16 15:04:09 2021 -0700 fix(pr): added tests commit 46c9ed6a71a13d415413a4eb3cb8643f2f0e2858 Author: Rani <[email protected]> Date: Thu Sep 16 12:56:24 2021 -0700 fix(notifications): use the correct branch for notifications (cherry picked from commit cb16c974b41f573cddf24b3d82f1b5b5624233cf)

…w environments are configured Squashed commit of the following: commit 15dbc86497c7f2a3981da5f347e941bb9faaff66 Author: Rani <[email protected]> Date: Tue Sep 21 08:42:37 2021 -0700 feat(preview-envs): added a new boolean to the schema that indicates if preview environments are configured commit 5be000c28eb7274fb833d6fb6de083a5a690af0c Author: Rani <[email protected]> Date: Tue Sep 21 08:41:51 2021 -0700 fix(dgs): moved processedConfig to a separate fetcher as it might be heavy for big configs (cherry picked from commit d1aeefc4c4d53f15fd42af59b98a3dfd0f089236)

(cherry picked from commit cf796a4461767badabfc6e75cc0776a8144d2e57)

(cherry picked from commit 251aa614a28d95c428001eab91d5a5537196647d)

…-level state (cherry picked from commit 9f898ba1fd040a2ef7cbccfe13fe76c866bcc4c1)

Squashed commit of the following: commit 43834b9b0afc437eff15024c99333321bfb81f02 Author: Luis Pollo <[email protected]> Date: Tue Sep 21 09:29:06 2021 -0700 test(slack): Enable running Slack callback tests with Netflix classpath commit 892669bac3d49757880a362f967e167cb2152d7f Author: Luis Pollo <[email protected]> Date: Mon Sep 20 23:09:15 2021 -0700 refactor(slack): Rename SlackAppController to SlackAppServlet commit 13f271a7377f28a7015fab416ceca4a7ffd9511c Author: Luis Pollo <[email protected]> Date: Mon Sep 20 17:44:46 2021 -0700 fix(slack): Fix Slack callback handling (cherry picked from commit a5f435a6daa18f63c4daf30f450ad7bc8f6a9a49)

Squashed commit of the following: commit 132bc6c7e9d57db28c2cb76deddf22ea7053bcd0 Author: Emily Burns <[email protected]> Date: Tue Sep 21 14:52:42 2021 -0700 fix(test): rewrite tests using different framework commit 97fd19ce6f77544cdf5bac5c3bcb4769d857b0a4 Author: Emily Burns <[email protected]> Date: Tue Sep 21 10:12:33 2021 -0700 fix(test): add more combined tests commit 198ab954849820414e53ab0fa86302dd7139dd82 Author: Emily Burns <[email protected]> Date: Fri Sep 17 15:46:55 2021 -0700 fix(PR): fix refs for titus commit 01dfa7c5e05b56af287d6289250c9c57e9899153 Author: Emily Burns <[email protected]> Date: Wed Sep 15 12:08:19 2021 -0700 chore(cluster): abstract construction of upsert stages (cherry picked from commit cfea585213160b1a0bb07514af66ab7fc1ee9bf3)

(cherry picked from commit 469f8c60e0aa189034c3c8b839cfb40b85ca2b65)

(cherry picked from commit 2cd00f332a847bcd4e1cb61616de5259267a2b7d)

Squashed commit of the following: commit 611c3ed7218aed38d333bb8820e28287ac00b40f Author: Rani <[email protected]> Date: Tue Sep 21 08:30:30 2021 -0700 fix(dgs): improve error message when git repo details are incorrect (cherry picked from commit d56dc01d391fc8a22bcb85189dd02dc572ccb83f)

(cherry picked from commit 9efbfe376a3a1a46f15c4e9caa73664129e1f760)

(cherry picked from commit 00ebd9df5ebf6dc42652e3e980718fb2282e18be)

(cherry picked from commit c02af67f1baf28d819f29ada53af81dad6cdeee5)

(cherry picked from commit c49f18b4c45aad05c62cf098a99e0567f98a4e1a)

(cherry picked from commit 4225e253b48ff61c2425a3407d7844ffbb36e86a)

(cherry picked from commit 76153101685bfc3261a2a170c72a740fcafc5412)

(cherry picked from commit 98cbc9a90ee0aefc7c48e29fa3dfc350e45ec8b2)

(cherry picked from commit a67491d070c8b0ee561e39bda211433ad004f06f)

(cherry picked from commit 5055ce2aae4f5f6e3f5dc94a0c3464ac70289b9c)

Squashed commit of the following: commit 1d3bbd296b5bca6eccecb57d7bcf1f06500643ce Author: Rani <[email protected]> Date: Wed Sep 29 20:10:11 2021 -0700 fix(pr): renaming commit 09812c9aeb5f56124d3ebbf26f8024ce6da1817e Author: Rani <[email protected]> Date: Wed Sep 29 10:06:58 2021 -0700 fix(import): invalidate the cache before fetching the app by name (cherry picked from commit 8533bc724aca404acccfd65524fa392dd145b7fb)

… a common place for reuse (cherry picked from commit 40c4aff2006224493111667b425d5612745868f7)

(cherry picked from commit 724d29d2bd2c6d666c2d1406f1f81053086962df)

(cherry picked from commit 0a65d0ff7e5be41c40ae3140201a80482d86a6e1)

Squashed commit of the following: commit b28ca2ed8b31f149adb35b17a8b670d954704383 Author: Rani <[email protected]> Date: Wed Sep 29 20:56:30 2021 -0700 fix(pr): updated the tests to include prMerged event commit a73bea12f59bd5c42269c83e1a2f5ac1c092bcad Author: Rani <[email protected]> Date: Wed Sep 29 20:50:30 2021 -0700 fix(notifications): explicit specify the notification branch (cherry picked from commit 10ca32f0ec7addc3bac74d53443abde3cb4f5971)

…to master Squashed commit of the following: commit d609eb75fdefeb9499f837d3acdd17e8ab52e793 Author: Gal Yardeni <[email protected]> Date: Thu Sep 30 14:38:28 2021 -0700 fix(unpinning): change message and rename commit 0eb7dfe2c457a4e30c233fc5d3f755f9a7e89dc6 Author: Gal Yardeni <[email protected]> Date: Wed Sep 29 15:27:17 2021 -0700 fix(unpinning): fix unpinning message if pinned version is the same as current (cherry picked from commit c1d5f14c2f4a1825ef1c8670dbefffee7aaf1bdd)

…is pinned or marked as bad Squashed commit of the following: commit 973291edc1604574858ef3db49a027de19c0f04a Author: Rani Horev <[email protected]> Date: Thu Sep 30 22:47:56 2021 +0000 fix(pr): update test title commit 404f0721e70a1238456a74be372ac7b5907d8851 Author: Rani <[email protected]> Date: Thu Sep 30 15:32:22 2021 -0700 fix(pr): fixed tests and add some more commit bd1fe2672b3fe0b90ed8debe62464641da323e42 Author: Rani <[email protected]> Date: Wed Sep 29 16:52:10 2021 -0700 fix(actuation): trigger recheck of resources when a version is pinned or marked as bad (cherry picked from commit d4c694acbb894833f3c8b2773da45907633c2892)

… redudant now we have status (cherry picked from commit 2c3c6c432ba66645c18492da3003ac45f660f43e)

…e MJ message Squashed commit of the following: commit 96b5fe54e3839e8cc1ff7ba0ab170a1e8c8d801d Author: Gal Yardeni <[email protected]> Date: Tue Oct 12 16:28:41 2021 -0700 feat(compareLink): fix condition commit bbee2d6d34bf3e2e92d36a5522b234dfed031e4d Author: Gal Yardeni <[email protected]> Date: Tue Oct 12 16:27:21 2021 -0700 feat(compareLink): fix condition commit d33cab79dd6260147843e6987b022ce5b5e00e25 Author: Gal Yardeni <[email protected]> Date: Tue Oct 12 16:01:23 2021 -0700 feat(compareLink): update message commit c57ac986243e301c8ce7de99ef07258eae77bd3b Author: Gal Yardeni <[email protected]> Date: Tue Oct 12 11:47:42 2021 -0700 feat(compareLink): calculate link only if approved commit 2bdb23140c0d335fc6f2c8abf74797630502bd25 Author: Gal Yardeni <[email protected]> Date: Tue Oct 12 11:26:35 2021 -0700 feat(compareLink): show which changeset were deployed as a part of the MJ message (cherry picked from commit cc4ff9705deb6e6c9ccc3d0b64dc09f790e129da)

Squashed commit of the following: commit 9b63140e6e9ebee331e4a64b328bc686cdfff7ac Author: Emily Burns <[email protected]> Date: Wed Oct 13 10:36:52 2021 -0700 fix(PR): feedback updates commit 2a9ee44ac6d2a03e7008d60cf8369614ed1628e7 Author: Emily Burns <[email protected]> Date: Mon Oct 11 11:30:45 2021 -0700 fix(PR): fix tests commit b45540927cd6186b3404419b9ec1148a601d1e28 Author: Emily Burns <[email protected]> Date: Mon Oct 11 10:37:48 2021 -0700 feat(PR): move managedRollout to spec level, refators commit 0a00606c00d28587d1f7b0ab932960c50db3393e Author: Emily Burns <[email protected]> Date: Thu Oct 7 09:25:58 2021 -0700 feat(rollout): add managed rollout option for clusters (cherry picked from commit 72cde8ec7b4acc13869c6552bb14eae0ce174a09)

Squashed commit of the following: commit ec6c0eb5860dc53d34bad163b17c434cab74b8c2 Author: Emily Burns <[email protected]> Date: Wed Oct 13 13:32:21 2021 -0700 chore(test): fix test for managed rollout (cherry picked from commit 77bce15e4acc5c1fdf66426a7c0e92a327402b3f)

Squashed commit of the following: commit 349be9edb3a75ec48f8ccca0d2f98dc0b60a14f8 Author: Luis Pollo <[email protected]> Date: Thu Oct 14 09:58:58 2021 -0700 feat(export): Improve error handling, add test script commit 8026169d9ff31967929bf10c24af08c18be132df Author: Luis Pollo <[email protected]> Date: Wed Oct 13 18:06:08 2021 -0700 refactor(export): Dedupe environment and artifacts commit 88480fb0565ca0addeff4832bbc62b061e14165b Author: Luis Pollo <[email protected]> Date: Tue Oct 12 18:41:38 2021 -0700 feat(export): Address feedback on processing of triggers commit a640407d3240863926406d0b28792d9a9ba33d25 Author: Luis Pollo <[email protected]> Date: Tue Oct 12 17:50:07 2021 -0700 refactor(export): Refactor export from pipelines to leverage existing export support commit e818b22040d99518d63b1b967953b4939885b13b Author: Luis Pollo <[email protected]> Date: Mon Oct 11 18:09:02 2021 -0700 chore(pr): Address review feedback commit 6d58c4e648088811c6c630a51cf65f0d46e5c67c Author: Luis Pollo <[email protected]> Date: Mon Oct 11 14:00:38 2021 -0700 feat(export): First stab at exporting pipelines (cherry picked from commit 9802d705f0a61a9aeead6c1e31ee02c65aa404c2)

Squashed commit of the following: commit 6a557f2a351aafcb29d8c3008e297cbd3ed40198 Author: Emily Burns <[email protected]> Date: Wed Oct 13 15:39:19 2021 -0700 feat(tasks): get only one batch of tasks (cherry picked from commit 4447d393bb532e3c1f164a5da9d5a6ebf4be26d3)

…ult actions (cherry picked from commit 250bdfd7a73c60ad782a5b594db11d770876c316)

Squashed commit of the following: commit 202b50efd0ef59dde4e81f0ed91191ab529d435b Author: Luis Pollo <[email protected]> Date: Thu Oct 14 17:04:33 2021 -0700 feat(preview-envs): Create preview environment artifacts automatically (cherry picked from commit 48dbf906e80aca6995a7936866c895190e6acf2c)

Squashed commit of the following: commit 906af21f8421f2eb584e65774182b514cc105641 Author: Emily Burns <[email protected]> Date: Mon Oct 18 10:04:31 2021 -0700 fix(task): load only 30s batch for all task (cherry picked from commit 0cb19d58cf8393e0e53f34795fba8741bf423d11)

Squashed commit of the following: commit cacd4334d8cec18b8a97286bc51d7b1126ab5ae9 Author: Rani <[email protected]> Date: Mon Oct 18 15:09:06 2021 -0700 fix(pr): fix tests commit f0211aa15fd05140add2f7651154e600db73b24d Author: Rani <[email protected]> Date: Mon Oct 18 14:25:11 2021 -0700 chore(pr): added some basic testing to verify both queries are working properly commit 5d1a800f1e2b7507ce0b8386fadbb274ecaae309 Author: Rani <[email protected]> Date: Mon Oct 18 14:24:38 2021 -0700 chore(dgs): removed unused vars commit 8b4ef5961b7b76c2655d08b987987b2d31cbecf1 Author: Rani <[email protected]> Date: Fri Oct 15 11:27:38 2021 -0700 fix(pr): missing prefix commit f119b5f06a2c0e2e06113d4eff3c1167e46bd70b Author: Rani <[email protected]> Date: Fri Oct 15 11:12:08 2021 -0700 fix(pr): missing underscore commit ba2f7a88f85804aa861011743765b6dc193844e3 Author: Rani <[email protected]> Date: Thu Oct 14 21:27:22 2021 -0700 chore(dgs): duplicate schema and all queries and mutations commit d7de84dabf53badd78f3e6beee5a9f9f09bf0210 Author: Rani <[email protected]> Date: Thu Oct 14 21:26:57 2021 -0700 chore(web): update dgs version and locks (cherry picked from commit 890203f593259cc7e25642e5482b47b4f7c03569)

Squashed commit of the following: commit 749c21b78dda3a36650507c00033efbf15cb03f9 Author: Emily Burns <[email protected]> Date: Mon Oct 18 16:11:36 2021 -0700 fix(PR): handle ec2 suspend processes commit d85e5f71063ae343a085511ebf0e991c31be9bcf Author: Emily Burns <[email protected]> Date: Mon Oct 18 09:24:43 2021 -0700 fix(PR): address feedback commit a6514f9470725d625dbd5f4ba03b7326a5d4f379 Author: Emily Burns <[email protected]> Date: Fri Oct 15 15:09:04 2021 -0700 fix(PR): ignore capacity when looking at diff for rollback commit cc3d3e7dfe5cf3b9e43d821bd32fb0c522199180 Author: Emily Burns <[email protected]> Date: Fri Oct 15 14:29:13 2021 -0700 feat(rollback): rollback to a server group if one exists with no diff (cherry picked from commit 30cc9b91cf87414455d92efdd470f87ced6130bb)

The buoy dependency was introduced in: 09156c9 feat(rollout): add managed rollout option for clusters Remove the dependency in order to be compatible with oss

…tflix.{}.internal" This reverts commit 6f7a545.

…ava-toolchain to master" This reverts commit 9adc94d.

This reverts commit fc68652.

Restore spinnakerGradleVersion. Otherwise, spring properties fail to load. Likely related to spring boot version. See: spinnaker/spinnaker-gradle-project#184

This reverts commit ba83149.

spinnakerbot · 2023-09-18T22:25:18Z

The following commits need their title changed:

9adc94d: Merge pull request Artifact Support for Docker images #571 in SPKR/keel-nflx from fix-java-toolchain to master
b5b0bed: Merge pull request Fixed dependency bump #598 in SPKR/keel-nflx from unpinMessage to master
9290f76: Revert "fix(preview-envs): Revisit resource renaming"
3a9958b: Merge pull request allow configuration of deploy strategy #617 in SPKR/keel-nflx from currentVersion to master
b4ccbdd: fix(build) Remove buoy dependency
afcc6f6: Revert "chore(build): Align kork/fiat coordinates on com.spinnaker.netflix.{}.internal"
9926d0e: Revert "Merge pull request Artifact Support for Docker images #571 in SPKR/keel-nflx from fix-java-toolchain to master"
15e65fa: Revert "fix(auth): instantiate filter correctly"
aebc4b9: fix(dependencies) Restore spinnakerGradleVersion
6805681: Revert "chore(build): see if we can get the build buildable on Java 8"

Please format your commit title into the form:

<type>(<scope>): <subject>, e.g. fix(kubernetes): address NPE in status check

This allows us to easily generate changelogs & determine semantic version numbers when cutting releases. You can read more about commit conventions here.

jasonmcintosh · 2023-09-19T01:00:49Z

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/ClusterDeployStrategy.kt

@@ -13,6 +13,10 @@ abstract class ClusterDeployStrategy {

  companion object {
    val DEFAULT_WAIT_FOR_INSTANCES_UP: Duration = Duration.ofMinutes(30)
+    const val RED_BLACK_STRATEGY = "red-black"


Note, red-black has been.. "deprecated" in favor of standard terms "blue-green"

Seeing lots of existing "red-black" terms in this repo. Going to check if they can be migrated and follow up

NOT an immediate need - spinnaker should auto translate those.

jasonmcintosh · 2023-09-19T01:01:56Z

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/ResourceSpec.kt

+   */
+  @JvmDefault
+  fun deepRename(suffix: String): ResourceSpec =
+    throw UnsupportedOperationException("Not implemented")


Intentional unsupported I'd guess for now?

Kotlin nit: should use TODO()

Found this deepRename call is used for Preview / PR environments. I haven't used this feature yet though

I was tempted to remove the default UnsupportedOperationException here, but it could cause plugins to break if it's not implemented, so I moved to TODO() 👍

keel-ec2-plugin/src/test/kotlin/com/netflix/spinnaker/keel/ec2/resource/LaunchConfigTests.kt

keel-web/src/main/kotlin/com/netflix/spinnaker/config/SlackRequestSecurityConfiguration.kt

jvz · 2023-09-19T16:34:53Z

keel-web/src/main/kotlin/com/netflix/spinnaker/config/SlackRequestSecurityConfiguration.kt

+      .antMatcher("/slack/notifications/callbacks")
+      .authorizeRequests()
+      .anyRequest()
+      .permitAll()


I should note that in Gate, we have a property, security.webhooks.default-auth-enabled (default to false), which toggles whether this should use authenticated() (when true) or permitAll() (when false). Might be useful to add.

Good catch, I ended up reverting this change since it relied on some security workarounds. That commit could be revisited if we ever decide to port it over

…fications" This reverts commit dec4851.

This reverts commit db018a9.

robfletcher and others added 30 commits September 2, 2023 15:13

fix(auth): instantiate filter correctly

c1ea933

(cherry picked from commit 7465b7b82602b0efb4607c509b670d8653b96b65)

feat(imdsv2): controlled and instumented rollout of IMDSv2

0922394

(cherry picked from commit cf796a4461767badabfc6e75cc0776a8144d2e57)

fix(imdsv2): bad column reference in query

5a08398

(cherry picked from commit 251aa614a28d95c428001eab91d5a5537196647d)

fix(imdsv2): actually translate IMDSv2 setting in spec to desired low…

de782e0

…-level state (cherry picked from commit 9f898ba1fd040a2ef7cbccfe13fe76c866bcc4c1)

fix(imdsv2): get current state of IMDSv2 flag

3581888

(cherry picked from commit 469f8c60e0aa189034c3c8b839cfb40b85ca2b65)

feat(preview-envs): Allow users to override FP email via notifications

dec4851

(cherry picked from commit 2cd00f332a847bcd4e1cb61616de5259267a2b7d)

fix(database): standardize table name

52bddd9

(cherry picked from commit 9efbfe376a3a1a46f15c4e9caa73664129e1f760)

fix(delete): Fix pipeline behavior for multi-stage delete tasks

e756e0c

(cherry picked from commit 00ebd9df5ebf6dc42652e3e980718fb2282e18be)

chore(imdsv2): added a missing test case (to reassure myself it worked)

ad7cda5

(cherry picked from commit c02af67f1baf28d819f29ada53af81dad6cdeee5)

fix(preview-envs): Fix moniker in destroyServerGroup

ff9b6b9

(cherry picked from commit c49f18b4c45aad05c62cf098a99e0567f98a4e1a)

feat(resolvers): extracted a base class for rollout-capable resolvers

2b34930

(cherry picked from commit 4225e253b48ff61c2425a3407d7844ffbb36e86a)

feat(resolvers): add column to capture rollout state

ad17f0e

(cherry picked from commit 76153101685bfc3261a2a170c72a740fcafc5412)

fix(resolvers): fixed typo in migration

48e51e3

(cherry picked from commit 98cbc9a90ee0aefc7c48e29fa3dfc350e45ec8b2)

feat(reports): Allow loading app cache from disk for local testing

abe027d

(cherry picked from commit a67491d070c8b0ee561e39bda211433ad004f06f)

feat(imdsv2): IMDSv2 resolver for Titus clusters

8a0bfb0

(cherry picked from commit 5055ce2aae4f5f6e3f5dc94a0c3464ac70289b9c)

refactor(resolvers): Moved some of the Arrow Optics declarations into…

481392a

… a common place for reuse (cherry picked from commit 40c4aff2006224493111667b425d5612745868f7)

fix(imdsv2): Wire up the Titus IMDSv2 resolver

955c3fb

(cherry picked from commit 724d29d2bd2c6d666c2d1406f1f81053086962df)

fix(imdsv2): Fix bean name collision in IMDSv2 resolvers

575ae54

(cherry picked from commit 0a65d0ff7e5be41c40ae3140201a80482d86a6e1)

feat(imdsv2): Removed the fast property that controls retries as it's…

6c3eeec

… redudant now we have status (cherry picked from commit 2c3c6c432ba66645c18492da3003ac45f660f43e)

gal-yardeni and others added 16 commits September 2, 2023 15:16

fix(ALBs): nested rule actions need to be serialized the same as defa…

d2de401

…ult actions (cherry picked from commit 250bdfd7a73c60ad782a5b594db11d770876c316)

fix(build) Remove buoy dependency

b4ccbdd

The buoy dependency was introduced in: 09156c9 feat(rollout): add managed rollout option for clusters Remove the dependency in order to be compatible with oss

Revert "chore(build): Align kork/fiat coordinates on com.spinnaker.ne…

afcc6f6

…tflix.{}.internal" This reverts commit 6f7a545.

Revert "Merge pull request spinnaker#571 in SPKR/keel-nflx from fix-j…

9926d0e

…ava-toolchain to master" This reverts commit 9adc94d.

Revert "fix(auth): instantiate filter correctly"

15e65fa

This reverts commit fc68652.

fix(dependencies) Restore spinnakerGradleVersion

aebc4b9

Restore spinnakerGradleVersion. Otherwise, spring properties fail to load. Likely related to spring boot version. See: spinnaker/spinnaker-gradle-project#184

Revert "chore(build): see if we can get the build buildable on Java 8"

6805681

This reverts commit ba83149.

jasonmcintosh reviewed Sep 19, 2023

View reviewed changes

keel-ec2-plugin/src/test/kotlin/com/netflix/spinnaker/keel/ec2/resource/LaunchConfigTests.kt Show resolved Hide resolved

jasonmcintosh reviewed Sep 19, 2023

View reviewed changes

keel-web/src/main/kotlin/com/netflix/spinnaker/config/SlackRequestSecurityConfiguration.kt Outdated Show resolved Hide resolved

jvz reviewed Sep 19, 2023

View reviewed changes

osoriano added 3 commits September 20, 2023 15:55

fix(exception): Move from UnsupportedOperationException to TODO

5d2a4f3

Revert "feat(preview-envs): Allow users to override FP email via noti…

7ec9211

…fications" This reverts commit dec4851.

Revert "fix(slack): Fix Slack callback handling"

fee0d81

This reverts commit db018a9.

jasonmcintosh approved these changes Sep 21, 2023

View reviewed changes

jasonmcintosh added the ready to merge Approved and ready for merge label Sep 21, 2023

mergify bot added the auto merged label Sep 21, 2023

mergify bot merged commit 92915bc into spinnaker:master Sep 21, 2023
4 checks passed

osoriano deleted the port-netflix-changes branch September 26, 2023 14:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(upstream): Port upstream changes from Netflix #2067

chore(upstream): Port upstream changes from Netflix #2067

osoriano commented Sep 18, 2023 •

edited

Loading

spinnakerbot commented Sep 18, 2023

jasonmcintosh Sep 19, 2023

osoriano Sep 20, 2023

jasonmcintosh Sep 21, 2023

jasonmcintosh Sep 19, 2023

jvz Sep 19, 2023

osoriano Sep 20, 2023

jvz Sep 19, 2023

osoriano Sep 20, 2023

chore(upstream): Port upstream changes from Netflix #2067

chore(upstream): Port upstream changes from Netflix #2067

Conversation

osoriano commented Sep 18, 2023 • edited Loading

spinnakerbot commented Sep 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

osoriano commented Sep 18, 2023 •

edited

Loading