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

Add support for inline ConfigMaps in StackSet CRD #7179

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Conversation

linki
Copy link
Member

@linki linki commented Mar 15, 2024

Update StackSet CRD for inline ConfigMaps. This is just an early version to update CRD in stackset-controller's e2e cluster to be able to run the test cases.

@linki linki added do-not-merge minor Minor changes, e.g. low risk config updates, changes that do not introduce a new API call. labels Mar 15, 2024
@linki
Copy link
Member Author

linki commented Mar 18, 2024

👍

@linki
Copy link
Member Author

linki commented Mar 18, 2024

👍

1 similar comment
@mikkeloscar
Copy link
Contributor

👍

@mikkeloscar mikkeloscar merged commit 545ec83 into dev Mar 18, 2024
10 checks passed
@mikkeloscar mikkeloscar deleted the inline-configmaps branch March 18, 2024 12:05
This was referenced Mar 18, 2024
Comment on lines +360 to +373
{{- if eq .Cluster.ConfigItems.stackset_inline_configmap_support_enabled "true" }}
configMap:
description: ConfigMap to be owned by Stack
properties:
data:
additionalProperties:
type: string
description: Data of the ConfigMap
type: object
name:
description: Name of the ConfigMap
type: string
type: object
{{ end }}
Copy link
Member

@AlexanderYastrebov AlexanderYastrebov Apr 11, 2024

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Noticed while working on #7297

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. Yes, this wasn't merged 🤦 I created a separate PR to fix it: zalando-incubator/stackset-controller#621

Copy link
Member Author

@linki linki Apr 11, 2024

Choose a reason for hiding this comment

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

We merged it to master now. It's slightly different than here (code comments) but the structure is the same. Let's update it in one of the subsequent PRs that modify the spec.

Copy link
Member

@AlexanderYastrebov AlexanderYastrebov Apr 11, 2024

Choose a reason for hiding this comment

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

Thank you, I will update that within #7297

AlexanderYastrebov added a commit that referenced this pull request Apr 11, 2024
Update to require unique hosts for ingress and routegroup
and include other pending updates.

See

* zalando-incubator/stackset-controller#580
* zalando-incubator/stackset-controller#583
* zalando-incubator/stackset-controller#612
* zalando-incubator/stackset-controller#613

Note also that #7179 added configMap fields that are not part of origin
CRDs yet.

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
AlexanderYastrebov added a commit that referenced this pull request Apr 11, 2024
Update to require unique hosts for ingress and routegroup
and include other pending updates.

See

* zalando-incubator/stackset-controller#580
* zalando-incubator/stackset-controller#583
* zalando-incubator/stackset-controller#612
* zalando-incubator/stackset-controller#613

Note also that #7179 added configMap fields that are not part of origin
CRDs yet.

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
AlexanderYastrebov added a commit that referenced this pull request Apr 11, 2024
Update to require unique hosts for ingress and routegroup
and include other pending updates.

See

* zalando-incubator/stackset-controller#580
* zalando-incubator/stackset-controller#583
* zalando-incubator/stackset-controller#612
* zalando-incubator/stackset-controller#613

Note also that #7179 added configMap fields that are not part of origin
CRDs yet.

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged/alpha merged/beta merged/kube-1.27 merged/stable minor Minor changes, e.g. low risk config updates, changes that do not introduce a new API call.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants