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.

Sign up for GitHub

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

Remove workaround to simulate empty key in config #110

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Remove workaround to simulate empty key in config #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions class/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ parameters:
code: CH
id: 44
# Maps BEs with empty countries to Switzerland automatically.
# We can't use "" as key because Reclass doesn't like empty dict keys.
__empty__:
"":
code: CH
id: 44
United Kingdom:
Expand Down
2 changes: 1 addition & 1 deletion component/api-server.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ local extraDeploymentArgs =
local countryList = std.filterMap(
function(name) params.odoo8.countries[name] != null,
function(name) {
name: if name == '__empty__' then '' else name,
name: name,
code: params.odoo8.countries[name].code,
id: params.odoo8.countries[name].id,
},
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/defaults/control-api/control-api/01_api_server/01_countries_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: v1
data:
billing_entity_odoo8_country_list.yaml: |-
- "code": "CH"
"id": 44
"name": ""
- "code": "AT"
"id": 13
"name": "Austria"
Expand Down Expand Up @@ -97,9 +100,6 @@ data:
- "code": "US"
"id": 235
"name": "United States"
- "code": "CH"
"id": 44
"name": ""
kind: ConfigMap
metadata:
annotations: {}
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/defaults/control-api/control-api/01_api_server/02_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
template:
metadata:
annotations:
checksum/countries: 3d77fba4c0d674be0911de6ec943c0f6
checksum/countries: 49d20409af18c4c3dd43af7ee501778a
labels:
app: control-api-apiserver
spec:
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/withcronjob/control-api/control-api/01_api_server/01_countries_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: v1
data:
billing_entity_odoo8_country_list.yaml: |-
- "code": "CH"
"id": 44
"name": ""
- "code": "AT"
"id": 13
"name": "Austria"
Expand Down Expand Up @@ -97,9 +100,6 @@ data:
- "code": "US"
"id": 235
"name": "United States"
- "code": "CH"
"id": 44
"name": ""
kind: ConfigMap
metadata:
annotations: {}
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/withcronjob/control-api/control-api/01_api_server/02_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
template:
metadata:
annotations:
checksum/countries: 3d77fba4c0d674be0911de6ec943c0f6
checksum/countries: 49d20409af18c4c3dd43af7ee501778a
labels:
app: control-api-apiserver
spec:
Expand Down
Loading