Skip to content

Commit 0318be1

Browse files
CatoverflowCatoverflow
committed
Rename set_x/unset_x spec functions to with_x/without_x (#609)
For spec where chaining is possible: - Rename `set_x` to `with_x` - Rename `unset_x` to `without_x`
1 parent c43ffd0 commit 0318be1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+602
-602
lines changed

‎src/controller_examples/fluent_controller/fluentbit/model/resource/daemon_set.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,19 @@ pub open spec fn update_daemon_set(fb: FluentBitView, found_daemon_set: DaemonSe
9494

9595
pub open spec fn make_daemon_set(fb: FluentBitView) -> DaemonSetView {
9696
DaemonSetView::default()
97-
.set_metadata(ObjectMetaView::default()
98-
.set_name(make_daemon_set_name(fb))
99-
.set_labels(make_labels(fb))
100-
.set_annotations(fb.spec.annotations)
101-
.set_owner_references(make_owner_references(fb))
102-
).set_spec(DaemonSetSpecView::default()
103-
.set_selector(LabelSelectorView::default().set_match_labels(make_base_labels(fb)))
104-
.set_template(PodTemplateSpecView::default()
105-
.set_metadata(ObjectMetaView::default()
106-
.set_labels(make_labels(fb))
107-
.set_annotations(fb.spec.annotations)
97+
.with_metadata(ObjectMetaView::default()
98+
.with_name(make_daemon_set_name(fb))
99+
.with_labels(make_labels(fb))
100+
.with_annotations(fb.spec.annotations)
101+
.with_owner_references(make_owner_references(fb))
102+
).with_spec(DaemonSetSpecView::default()
103+
.with_selector(LabelSelectorView::default().with_match_labels(make_base_labels(fb)))
104+
.with_template(PodTemplateSpecView::default()
105+
.with_metadata(ObjectMetaView::default()
106+
.with_labels(make_labels(fb))
107+
.with_annotations(fb.spec.annotations)
108108
)
109-
.set_spec(make_fluentbit_pod_spec(fb))
109+
.with_spec(make_fluentbit_pod_spec(fb))
110110
)
111111
)
112112
}
@@ -125,21 +125,21 @@ pub open spec fn make_fluentbit_pod_spec(fb: FluentBitView) -> PodSpecView {
125125
PodSpecView::default().init_containers
126126
},
127127
volumes: Some({
128-
let config_volume = VolumeView::default().set_name("config"@)
129-
.set_secret(SecretVolumeSourceView::default().set_secret_name(fb.spec.fluentbit_config_name));
130-
let varlibcontainers_volume = VolumeView::default().set_name("varlibcontainers"@)
131-
.set_host_path(HostPathVolumeSourceView::default().set_path({
128+
let config_volume = VolumeView::default().with_name("config"@)
129+
.with_secret(SecretVolumeSourceView::default().with_secret_name(fb.spec.fluentbit_config_name));
130+
let varlibcontainers_volume = VolumeView::default().with_name("varlibcontainers"@)
131+
.with_host_path(HostPathVolumeSourceView::default().with_path({
132132
if fb.spec.container_log_real_path.is_Some() {
133133
fb.spec.container_log_real_path.get_Some_0()
134134
} else { "/containers"@ }
135135
}));
136-
let varlogs_volume = VolumeView::default().set_name("varlogs"@)
137-
.set_host_path(HostPathVolumeSourceView::default().set_path("/var/log"@));
138-
let systemd_volume = VolumeView::default().set_name("systemd"@)
139-
.set_host_path(HostPathVolumeSourceView::default().set_path("/var/log/journal"@));
136+
let varlogs_volume = VolumeView::default().with_name("varlogs"@)
137+
.with_host_path(HostPathVolumeSourceView::default().with_path("/var/log"@));
138+
let systemd_volume = VolumeView::default().with_name("systemd"@)
139+
.with_host_path(HostPathVolumeSourceView::default().with_path("/var/log/journal"@));
140140
if fb.spec.position_db.is_Some() {
141-
let positions_volume = VolumeView::default().set_name("positions"@)
142-
.set_host_path(fb.spec.position_db.get_Some_0());
141+
let positions_volume = VolumeView::default().with_name("positions"@)
142+
.with_host_path(fb.spec.position_db.get_Some_0());
143143
if !fb.spec.disable_log_volumes && fb.spec.volumes.is_Some() {
144144
fb.spec.volumes.get_Some_0().push(config_volume).push(varlibcontainers_volume).push(varlogs_volume)
145145
.push(systemd_volume).push(positions_volume)
@@ -244,8 +244,8 @@ pub open spec fn make_fluentbit_pod_spec(fb: FluentBitView) -> PodSpecView {
244244
}),
245245
ports: {
246246
let metrics_port = ContainerPortView::default()
247-
.set_name("metrics"@)
248-
.set_container_port({
247+
.with_name("metrics"@)
248+
.with_container_port({
249249
let port = if fb.spec.metrics_port.is_Some() { fb.spec.metrics_port.get_Some_0() } else { 2020 };
250250
port
251251
});

‎src/controller_examples/fluent_controller/fluentbit/model/resource/role_binding.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,19 @@ pub open spec fn update_role_binding(fb: FluentBitView, found_role_binding: Role
9494

9595
pub open spec fn make_role_binding(fb: FluentBitView) -> RoleBindingView {
9696
RoleBindingView::default()
97-
.set_metadata(ObjectMetaView::default()
98-
.set_name(make_role_binding_name(fb))
99-
.set_owner_references(make_owner_references(fb))
100-
.set_labels(make_labels(fb))
101-
.set_annotations(fb.spec.annotations)
102-
).set_role_ref(RoleRefView::default()
103-
.set_api_group("rbac.authorization.k8s.io"@)
104-
.set_kind("Role"@)
105-
.set_name(make_role_name(fb))
106-
).set_subjects(seq![SubjectView::default()
107-
.set_kind("ServiceAccount"@)
108-
.set_name(make_service_account_name(fb))
109-
.set_namespace(fb.metadata.namespace.get_Some_0())
97+
.with_metadata(ObjectMetaView::default()
98+
.with_name(make_role_binding_name(fb))
99+
.with_owner_references(make_owner_references(fb))
100+
.with_labels(make_labels(fb))
101+
.with_annotations(fb.spec.annotations)
102+
).with_role_ref(RoleRefView::default()
103+
.with_api_group("rbac.authorization.k8s.io"@)
104+
.with_kind("Role"@)
105+
.with_name(make_role_name(fb))
106+
).with_subjects(seq![SubjectView::default()
107+
.with_kind("ServiceAccount"@)
108+
.with_name(make_service_account_name(fb))
109+
.with_namespace(fb.metadata.namespace.get_Some_0())
110110
])
111111
}
112112

‎src/controller_examples/fluent_controller/fluentbit_config/model/resource/secret.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ pub open spec fn make_secret_key(fbc: FluentBitConfigView) -> ObjectRef {
7979

8080
pub open spec fn make_secret(fbc: FluentBitConfigView) -> SecretView {
8181
SecretView::default()
82-
.set_metadata(ObjectMetaView::default()
83-
.set_name(make_secret_name(fbc))
84-
.set_owner_references(make_owner_references(fbc))
85-
).set_data(Map::empty()
82+
.with_metadata(ObjectMetaView::default()
83+
.with_name(make_secret_name(fbc))
84+
.with_owner_references(make_owner_references(fbc))
85+
).with_data(Map::empty()
8686
.insert("fluent-bit.conf"@, fbc.spec.fluentbit_config)
8787
.insert("parsers.conf"@, fbc.spec.parsers_config)
8888
)

‎src/controller_examples/rabbitmq_controller/model/resource/common.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,31 @@ pub open spec fn make_owner_references(rabbitmq: RabbitmqClusterView) -> Seq<Own
2323

2424
pub open spec fn make_secret(rabbitmq: RabbitmqClusterView, name: StringView, data: Map<StringView, StringView>) -> SecretView {
2525
SecretView::default()
26-
.set_metadata(ObjectMetaView::default()
27-
.set_name(name)
28-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
29-
.set_owner_references(make_owner_references(rabbitmq))
30-
.set_labels(make_labels(rabbitmq))
31-
.set_annotations(rabbitmq.spec.annotations)
32-
).set_data(data)
26+
.with_metadata(ObjectMetaView::default()
27+
.with_name(name)
28+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
29+
.with_owner_references(make_owner_references(rabbitmq))
30+
.with_labels(make_labels(rabbitmq))
31+
.with_annotations(rabbitmq.spec.annotations)
32+
).with_data(data)
3333
}
3434

3535
pub open spec fn make_service(rabbitmq: RabbitmqClusterView, name: StringView, ports: Seq<ServicePortView>, cluster_ip: bool) -> ServiceView {
3636
ServiceView::default()
37-
.set_metadata(ObjectMetaView::default()
38-
.set_name(name)
39-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
40-
.set_owner_references(make_owner_references(rabbitmq))
41-
.set_labels(make_labels(rabbitmq))
42-
.set_annotations(rabbitmq.spec.annotations)
43-
).set_spec({
37+
.with_metadata(ObjectMetaView::default()
38+
.with_name(name)
39+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
40+
.with_owner_references(make_owner_references(rabbitmq))
41+
.with_labels(make_labels(rabbitmq))
42+
.with_annotations(rabbitmq.spec.annotations)
43+
).with_spec({
4444
let spec = ServiceSpecView::default()
45-
.set_ports(ports)
46-
.set_selector(Map::empty()
45+
.with_ports(ports)
46+
.with_selector(Map::empty()
4747
.insert("app"@, rabbitmq.metadata.name.get_Some_0())
48-
).set_publish_not_ready_addresses(true);
48+
).with_publish_not_ready_addresses(true);
4949
if !cluster_ip {
50-
spec.set_cluster_ip("None"@)
50+
spec.with_cluster_ip("None"@)
5151
} else {
5252
spec
5353
}

‎src/controller_examples/rabbitmq_controller/model/resource/headless_service.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ pub open spec fn update_headless_service(rabbitmq: RabbitmqClusterView, found_he
102102

103103
pub open spec fn make_headless_service(rabbitmq: RabbitmqClusterView) -> ServiceView {
104104
let mut ports = seq![
105-
ServicePortView::default().set_name("epmd"@).set_port(4369),
106-
ServicePortView::default().set_name("cluster-rpc"@).set_port(25672)
105+
ServicePortView::default().with_name("epmd"@).with_port(4369),
106+
ServicePortView::default().with_name("cluster-rpc"@).with_port(25672)
107107
];
108108
make_service(rabbitmq, make_headless_service_name(rabbitmq), ports, false)
109109
}

‎src/controller_examples/rabbitmq_controller/model/resource/rabbitmq_plugins.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ pub open spec fn update_plugins_config_map(rabbitmq: RabbitmqClusterView, found_
9696

9797
pub open spec fn make_plugins_config_map(rabbitmq: RabbitmqClusterView) -> ConfigMapView {
9898
ConfigMapView::default()
99-
.set_metadata(ObjectMetaView::default()
100-
.set_name(make_plugins_config_map_name(rabbitmq))
101-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
102-
.set_owner_references(make_owner_references(rabbitmq))
103-
.set_labels(make_labels(rabbitmq))
104-
.set_annotations(rabbitmq.spec.annotations)
99+
.with_metadata(ObjectMetaView::default()
100+
.with_name(make_plugins_config_map_name(rabbitmq))
101+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
102+
.with_owner_references(make_owner_references(rabbitmq))
103+
.with_labels(make_labels(rabbitmq))
104+
.with_annotations(rabbitmq.spec.annotations)
105105
)
106-
.set_data(Map::empty()
106+
.with_data(Map::empty()
107107
.insert("enabled_plugins"@, "[rabbitmq_peer_discovery_k8s,rabbitmq_prometheus,rabbitmq_management]."@)
108108
)
109109
}

‎src/controller_examples/rabbitmq_controller/model/resource/role.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ pub open spec fn update_role(rabbitmq: RabbitmqClusterView, found_role: RoleView
9696

9797
pub open spec fn make_role(rabbitmq: RabbitmqClusterView) -> RoleView {
9898
RoleView::default()
99-
.set_metadata(ObjectMetaView::default()
100-
.set_name(make_role_name(rabbitmq))
101-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
102-
.set_owner_references(make_owner_references(rabbitmq))
103-
.set_labels(make_labels(rabbitmq))
104-
.set_annotations(rabbitmq.spec.annotations)
105-
).set_rules(
99+
.with_metadata(ObjectMetaView::default()
100+
.with_name(make_role_name(rabbitmq))
101+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
102+
.with_owner_references(make_owner_references(rabbitmq))
103+
.with_labels(make_labels(rabbitmq))
104+
.with_annotations(rabbitmq.spec.annotations)
105+
).with_rules(
106106
seq![
107-
PolicyRuleView::default().set_api_groups(seq![""@]).set_resources(seq!["endpoints"@]).set_verbs(seq!["get"@]),
108-
PolicyRuleView::default().set_api_groups(seq![""@]).set_resources(seq!["events"@]).set_verbs(seq!["create"@]),
107+
PolicyRuleView::default().with_api_groups(seq![""@]).with_resources(seq!["endpoints"@]).with_verbs(seq!["get"@]),
108+
PolicyRuleView::default().with_api_groups(seq![""@]).with_resources(seq!["events"@]).with_verbs(seq!["create"@]),
109109
]
110110
)
111111
}

‎src/controller_examples/rabbitmq_controller/model/resource/role_binding.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ pub open spec fn update_role_binding(rabbitmq: RabbitmqClusterView, found_role_b
9696

9797
pub open spec fn make_role_binding(rabbitmq: RabbitmqClusterView) -> RoleBindingView {
9898
RoleBindingView::default()
99-
.set_metadata(ObjectMetaView::default()
100-
.set_name(make_role_binding_name(rabbitmq))
101-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
102-
.set_owner_references(make_owner_references(rabbitmq))
103-
.set_labels(make_labels(rabbitmq))
104-
.set_annotations(rabbitmq.spec.annotations)
105-
).set_role_ref(RoleRefView::default()
106-
.set_api_group("rbac.authorization.k8s.io"@)
107-
.set_kind("Role"@)
108-
.set_name(rabbitmq.metadata.name.get_Some_0() + "-peer-discovery"@)
109-
).set_subjects(seq![SubjectView::default()
110-
.set_kind("ServiceAccount"@)
111-
.set_name(rabbitmq.metadata.name.get_Some_0() + "-server"@)
112-
.set_namespace(rabbitmq.metadata.namespace.get_Some_0())
99+
.with_metadata(ObjectMetaView::default()
100+
.with_name(make_role_binding_name(rabbitmq))
101+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
102+
.with_owner_references(make_owner_references(rabbitmq))
103+
.with_labels(make_labels(rabbitmq))
104+
.with_annotations(rabbitmq.spec.annotations)
105+
).with_role_ref(RoleRefView::default()
106+
.with_api_group("rbac.authorization.k8s.io"@)
107+
.with_kind("Role"@)
108+
.with_name(rabbitmq.metadata.name.get_Some_0() + "-peer-discovery"@)
109+
).with_subjects(seq![SubjectView::default()
110+
.with_kind("ServiceAccount"@)
111+
.with_name(rabbitmq.metadata.name.get_Some_0() + "-server"@)
112+
.with_namespace(rabbitmq.metadata.namespace.get_Some_0())
113113
])
114114
}
115115

‎src/controller_examples/rabbitmq_controller/model/resource/service.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ pub open spec fn update_main_service(rabbitmq: RabbitmqClusterView, found_main_s
104104

105105
pub open spec fn make_main_service(rabbitmq: RabbitmqClusterView) -> ServiceView {
106106
let ports = seq![
107-
ServicePortView::default().set_name("amqp"@).set_port(5672).set_app_protocol("amqp"@),
108-
ServicePortView::default().set_name("management"@).set_port(15672).set_app_protocol("http"@),
109-
ServicePortView::default().set_name("prometheus"@).set_port(15692).set_app_protocol("prometheus.io/metrics"@),
107+
ServicePortView::default().with_name("amqp"@).with_port(5672).with_app_protocol("amqp"@),
108+
ServicePortView::default().with_name("management"@).with_port(15672).with_app_protocol("http"@),
109+
ServicePortView::default().with_name("prometheus"@).with_port(15692).with_app_protocol("prometheus.io/metrics"@),
110110
];
111111
make_service(rabbitmq, make_main_service_name(rabbitmq), ports, true)
112112
}

0 commit comments

Comments
 (0)