Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(localfiles): Support relative local files to hal config home #13

Merged
merged 45 commits into from
Sep 11, 2019

Conversation

german-muzquiz
Copy link

No description provided.

plumpy and others added 30 commits July 24, 2019 13:04
spinnaker#1376)

* refactor(config): remove a pointless try/catch block

* refactor(tests): remove an unused import

* fix(config): parse 'oauthScopes' stanzas that were incorrectly written

The old version of Lombok used in Halyard <=1.21 didn't copy
@JsonProperty annotations to the generated methods. This means Jackson
was seeing the field as 'oAuthScopes' and the getter/setter as a
separate 'oauthScopes' property. The same data would be written to both
properties, and during parsing whichever came last in the file would be
persisted into the object.

With new versions of Lombok (>=1.18.8), the @JsonProperty annotation is
copied to the bean methods, so the 'oauthScopes' property disappears and
Jackson can no longer parse those old files.

This commit adds some methods to support parsing the files generated by
previous versions of Halyard, but will no longer write out the
incorrect duplicate data.

* chore(copyright): add a missing copyright header
* feat(secret): decrypt secrets before sending to deck

* code review changes
Remove the $REPO_NAME variable from the cloudbuild.yaml file; this is being used
to decide the name of the image to push which will not always correspond to the
image name. In particular, if we start publishing both alpine and ubuntu images
we'll want the image name to have a suffix reflecting that.
* feat(plugins): adding halyard commands for plugins

* chore(refactor): use toMap instead of a concurrentMap collector
* fix(kubernetes): Added support for tolerationn

Signed-off-by: rverma-nikiai <[email protected]>

* feat(kubernetes): Added support for Tolerations

Added support for tolerations

Signed-off-by: rverma-nikiai <[email protected]>

* feat(kubernetes): Support for tolerations

* fix(kubernetes): Added support for Tolerations, fixed access
…spinnaker#1401)

* refactor(deploy/kubernetes): Removed duplicated code

* feat(deploy/kubernetes): Option to select the image variant to deploy

Supports `slim` and `ubuntu`, the former being the default.
Ubuntu image supported starting with v1.16.0.
German Muzquiz and others added 14 commits September 5, 2019 11:37
Usually when referencing local files in main hal config with a relative
path, halyard throws this error:

Problems in Global:
! ERROR Failed to backup user file: default/files/kubeconfig-main

- Failed to generate config.

With this change, relative files will be automatically resolved relative
from hal config home.
… of github.com:armory-io/halyard into test-operator

� Conflicts:
�	halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2Service.java
// write all local files in hal config root
writeFile("", et.getKey(), et.getValue());
} else {
String filePath = et.getKey().replaceAll("__", File.separator);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about SERVICE_SETTINGS_KEY?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that service settings files are processed in writeServiceSettings, this loop processes profile files and relative resource files

@ncknt ncknt merged commit ac0da7e into gen-manifests Sep 11, 2019
@ncknt ncknt deleted the gen-manifests-local-files branch September 11, 2019 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.