-
Notifications
You must be signed in to change notification settings - Fork 807
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(kubernetes): add expression evaluation options to bake and deplo…
…y manifest stages
- Loading branch information
1 parent
2bcb0f7
commit 0d54daa
Showing
4 changed files
with
143 additions
and
21 deletions.
There are no files selected for viewing
55 changes: 55 additions & 0 deletions
55
...rc/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright 2019 Google, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca.bakery.tasks.manifests; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact; | ||
| import lombok.Getter; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| @Getter | ||
| public class BakeManifestContext { | ||
| private final List<CreateBakeManifestTask.InputArtifactPair> inputArtifacts; | ||
| private final List<ExpectedArtifact> expectedArtifacts; | ||
| private final Map<String, Object> overrides; | ||
| private final Boolean evaluateOverrideExpressions; | ||
| private final String templateRenderer; | ||
| private final String outputName; | ||
| private final String namespace; | ||
|
|
||
| // There does not seem to be a way to auto-generate a constructor using our current version of Lombok (1.16.20) that | ||
| // Jackson can use to deserialize. | ||
| public BakeManifestContext( | ||
| @JsonProperty("inputArtifacts") List<CreateBakeManifestTask.InputArtifactPair> inputArtifacts, | ||
| @JsonProperty("expectedArtifacts") List<ExpectedArtifact> expectedArtifacts, | ||
| @JsonProperty("overrides") Map<String, Object> overrides, | ||
| @JsonProperty("evaluateOverrideExpressions") Boolean evaluateOverrideExpressions, | ||
| @JsonProperty("templateRenderer") String templateRenderer, | ||
| @JsonProperty("outputName") String outputName, | ||
| @JsonProperty("namespace") String namespace | ||
| ) { | ||
| this.inputArtifacts = inputArtifacts; | ||
| this.expectedArtifacts = expectedArtifacts; | ||
| this.overrides = overrides; | ||
| this.evaluateOverrideExpressions = evaluateOverrideExpressions; | ||
| this.templateRenderer = templateRenderer; | ||
| this.outputName = outputName; | ||
| this.namespace = namespace; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...n/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/DeployManifestContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2019 Google, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca.clouddriver.tasks.manifest; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import lombok.Getter; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| public class DeployManifestContext extends HashMap<String, Object> { | ||
| private final String source; | ||
| private final String manifestArtifactId; | ||
| private final String manifestArtifactAccount; | ||
| private final Boolean skipExpressionEvaluation; | ||
| private final List<String> requiredArtifactIds; | ||
|
|
||
| // There does not seem to be a way to auto-generate a constructor using our current version of Lombok (1.16.20) that | ||
| // Jackson can use to deserialize. | ||
| public DeployManifestContext( | ||
| @JsonProperty("source") String source, | ||
| @JsonProperty("manifestArtifactId") String manifestArtifactId, | ||
| @JsonProperty("manifestArtifactAccount") String manifestArtifactAccount, | ||
| @JsonProperty("skipExpressionEvaluation") Boolean skipExpressionEvaluation, | ||
| @JsonProperty("requiredArtifactIds") List<String> requiredArtifactIds | ||
| ){ | ||
| this.source = source; | ||
| this.manifestArtifactId = manifestArtifactId; | ||
| this.manifestArtifactAccount = manifestArtifactAccount; | ||
| this.skipExpressionEvaluation = skipExpressionEvaluation; | ||
| this.requiredArtifactIds = requiredArtifactIds; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters