-
Notifications
You must be signed in to change notification settings - Fork 22
Change spire configmaps to yaml, rendered as json #113
Conversation
Here's one that works attached. seems to be maybe a slight formatting issue:
|
K. there were 3 things I needed to change to get it to start. Put the array down one level. like:
Second, the service_account_allow_list array is already an array. so remove the - from it. Third, there is a bug in 1.6.0 and 1.6.1 reguarding json loading. its fixed in trunk but not released yet: spiffe/spire#3939. For testing, can use the 1.5.4 version of the server. |
eb82932
to
ba16b49
Compare
ba16b49
to
031cec6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just the one little change that I can see. The rest looks good.
charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml
Outdated
Show resolved
Hide resolved
c2be1c4
to
7822595
Compare
bd3ad10
to
3647eda
Compare
Rebased to have the federation option also included. |
2e7cee1
to
a9e2ffe
Compare
a9e2ffe
to
4777402
Compare
This kind of looks like the production-example test is not actually failing like it should? |
Yeah. There is an issue with the prod test. Fix is here: #183 |
4777402
to
987108e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, due to merge ordering, we lost the nightly appVersion in the charts which is why all the tests are failing.
ec7bc94
to
80466fe
Compare
728e2f8
to
6fc5363
Compare
Maybe I should have mentioned. All the suggestions would have to go in all at once to work, as its one patch. |
42c2fbb
to
e846291
Compare
I'm not sure how, but the pr seems to have lost its '-'s for each plugin. |
Besides the issue in the suggestion, I think there is one more issue and this can merge. charts/spire/README.md.gotmpl:| SPIRE | same with README.md |
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
474b5ac
to
eaca827
Compare
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
eaca827
to
e3b0d00
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
* 46f10e1 Merge pull request #237 from spiffe/fix-check-versions * 3889d22 Fix quotation bug in update-version.sh * 6a894e8 Move update-versions.sh script * 91083a6 Add post-install scripts to all tests to capture failure details in GitHub workflow summary (#88) * 9afb6f8 Merge pull request #242 from spiffe/shellcheck * 99af475 Resolve shellcheck issues * d0a1e12 Add workflow with shellcheck * 8abd75e Merge pull request #241 from spiffe/dependabot/github_actions/sigstore/cosign-installer-3.0.3 * 252f1f5 Bump cosign to v2.0.2 * 247e3e5 Bump sigstore/cosign-installer from 3.0.2 to 3.0.3 * 17d62f1 Add an action to find new versions of helm charts (#184) * 2c360a5 Add global for image registry (#201) * 3cc8955 Move reusable macros to root chart (#218) * 3fc8178 Add k8s 1.27 to CI + bump other versions to latest patches (#219) * 6b61744 Merge pull request #113 from spiffe/spire-config-as-yaml-converted-json * 9e03f29 Merge branch 'main' into spire-config-as-yaml-converted-json * 210ed02 Remove dead code (#217) * e3b0d00 Bump min required spire 1.6.x version for this chart * d7dcfeb Change spiffe-oidc-provider-config configmap to yaml format * 861108c Change spire-agent configmap to yaml format * 1d72b57 Change spire-server configmap to yaml format Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
* 65312f8 Include dependency values in documentation (#275) * 5489212 Remove persistence.enabled flag (#274) * b315324 Allow for ConfigMaps to be annotated (#272) * 013eb61 Fix spacing for spire server service annotation (#273) * 73435be Add project glossary. (#262) * c4656a7 Replicas > 1 is not allowed with sqlite driver (#269) * d3da3ee External database configuration (#225) * ce78bea Add Edwin Buck as a maintainer. (#267) * 1f09d7b Bump test chart dependencies (#264) * aa6b40c Add project overview. (#258) * 8e7e6eb Allow trust bundle url to be set along with format (#256) * 1e09ea5 Bump peter-evans/create-pull-request from 5.0.0 to 5.0.1 (#253) * 6760cd2 Bump test chart dependencies (#252) * 61e338d Fix example production typos (#244) * 3d81928 Add skipKubeletVerification configurable (#243) * 46f10e1 Merge pull request #237 from spiffe/fix-check-versions * 3889d22 Fix quotation bug in update-version.sh * 6a894e8 Move update-versions.sh script * 91083a6 Add post-install scripts to all tests to capture failure details in GitHub workflow summary (#88) * 9afb6f8 Merge pull request #242 from spiffe/shellcheck * 99af475 Resolve shellcheck issues * d0a1e12 Add workflow with shellcheck * 8abd75e Merge pull request #241 from spiffe/dependabot/github_actions/sigstore/cosign-installer-3.0.3 * 252f1f5 Bump cosign to v2.0.2 * 247e3e5 Bump sigstore/cosign-installer from 3.0.2 to 3.0.3 * 17d62f1 Add an action to find new versions of helm charts (#184) * 2c360a5 Add global for image registry (#201) * 3cc8955 Move reusable macros to root chart (#218) * 3fc8178 Add k8s 1.27 to CI + bump other versions to latest patches (#219) * 6b61744 Merge pull request #113 from spiffe/spire-config-as-yaml-converted-json * 9e03f29 Merge branch 'main' into spire-config-as-yaml-converted-json * 210ed02 Remove dead code (#217) * e3b0d00 Bump min required spire 1.6.x version for this chart * d7dcfeb Change spiffe-oidc-provider-config configmap to yaml format * 861108c Change spire-agent configmap to yaml format * 1d72b57 Change spire-server configmap to yaml format Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Please review the below changelog to ensure this matches up with the semantic version being applied. > **Note**: **Maintainers** ensure to run following after merging this PR to trigger the release workflow: > > ```shell > git checkout main > git pull > git checkout release > git pull > git merge main > git push > ``` **Changes in this release** * 65312f8 Include dependency values in documentation (#275) * 5489212 Remove persistence.enabled flag (#274) * b315324 Allow for ConfigMaps to be annotated (#272) * 013eb61 Fix spacing for spire server service annotation (#273) * 73435be Add project glossary. (#262) * c4656a7 Replicas > 1 is not allowed with sqlite driver (#269) * d3da3ee External database configuration (#225) * ce78bea Add Edwin Buck as a maintainer. (#267) * 1f09d7b Bump test chart dependencies (#264) * aa6b40c Add project overview. (#258) * 8e7e6eb Allow trust bundle url to be set along with format (#256) * 1e09ea5 Bump peter-evans/create-pull-request from 5.0.0 to 5.0.1 (#253) * 6760cd2 Bump test chart dependencies (#252) * 61e338d Fix example production typos (#244) * 3d81928 Add skipKubeletVerification configurable (#243) * 46f10e1 Merge pull request #237 from spiffe/fix-check-versions * 3889d22 Fix quotation bug in update-version.sh * 6a894e8 Move update-versions.sh script * 91083a6 Add post-install scripts to all tests to capture failure details in GitHub workflow summary (#88) * 9afb6f8 Merge pull request #242 from spiffe/shellcheck * 99af475 Resolve shellcheck issues * d0a1e12 Add workflow with shellcheck * 8abd75e Merge pull request #241 from spiffe/dependabot/github_actions/sigstore/cosign-installer-3.0.3 * 252f1f5 Bump cosign to v2.0.2 * 247e3e5 Bump sigstore/cosign-installer from 3.0.2 to 3.0.3 * 17d62f1 Add an action to find new versions of helm charts (#184) * 2c360a5 Add global for image registry (#201) * 3cc8955 Move reusable macros to root chart (#218) * 3fc8178 Add k8s 1.27 to CI + bump other versions to latest patches (#219) * 6b61744 Merge pull request #113 from spiffe/spire-config-as-yaml-converted-json * 9e03f29 Merge branch 'main' into spire-config-as-yaml-converted-json * 210ed02 Remove dead code (#217) * e3b0d00 Bump min required spire 1.6.x version for this chart * d7dcfeb Change spiffe-oidc-provider-config configmap to yaml format * 861108c Change spire-agent configmap to yaml format * 1d72b57 Change spire-server configmap to yaml format Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
resolves #86