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

Jump to bottom

fair #443

Merged
merged 3 commits into from
Nov 25, 2024
Merged

fair #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b1e5c3
fair
milesstoetzner Nov 21, 2024
c0f5fc3
some adaptations
milesstoetzner Nov 22, 2024
ae0bdc7
add notes
milesstoetzner Nov 25, 2024
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
248 changes: 124 additions & 124 deletions docs/docs/variability4tosca/quality/index.md
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 176 additions & 0 deletions examples/unfurl-technology---boutique---plus-maintenance-automated/scripts/study-010.txt
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 176 additions & 0 deletions examples/unfurl-technology---boutique---plus-maintenance-automated/scripts/sutdy-011.txt
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 176 additions & 0 deletions examples/unfurl-technology---boutique---plus-maintenance-automated/scripts/sutdy-012.txt
View file
Open in desktop

Large diffs are not rendered by default.

178 changes: 178 additions & 0 deletions examples/unfurl-technology---boutique---plus-maintenance-automated/scripts/sutdy-013.txt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion examples/unfurl-technology---boutique---plus-maintenance-automated/study.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
study: technology
originals:
- gcp
- kubernetes
- os-medium
- os-large
3 changes: 0 additions & 3 deletions ...les/unfurl-technology---boutique---plus-maintenance-manual/variable-service-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ topology_template:
type: boolean
default: false

options:
enrich_technologies: false

node_templates:
###################################################
#
Expand Down
45 changes: 0 additions & 45 deletions ...les/unfurl-technology---boutique---plus-original-automated/variable-service-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,9 @@ topology_template:
gcp_project:
type: string

k8s_host:
type: string

k8s_ca_cert_file:
type: string

k8s_client_cert_file:
type: string

k8s_client_key_file:
type: string

variability:
expressions:
is_gcp: {equal: [{variability_input: env}, GCP]}
is_kubernetes: {equal: [{variability_input: env}, KUBERNETES]}
is_openstack: {equal: [{variability_input: env}, OPENSTACK]}
has_optional_payment_feature: {equal: [{variability_input: optional_payment_feature}, true]}
has_premium_payment_feature: {equal: [{variability_input: premium_payment_feature}, true]}
Expand Down Expand Up @@ -143,7 +130,6 @@ topology_template:
- recommendation: recommendation_component
- advertisement: advertisement_component
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -154,7 +140,6 @@ topology_template:
type: ingress
requirements:
- application: frontend_component
- host: kubernetes_cluster
- host: virtual_machine

###################################################
Expand Down Expand Up @@ -196,7 +181,6 @@ topology_template:
- cart: cart_component
- product: product_component
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -218,7 +202,6 @@ topology_template:
- disable_profiler: '1'
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand Down Expand Up @@ -252,7 +235,6 @@ topology_template:
conditions: {not: {logic_expression: has_premium_payment_feature}}
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -274,7 +256,6 @@ topology_template:
- disable_profiler: '1'
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -296,7 +277,6 @@ topology_template:
- disable_profiler: '1'
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand Down Expand Up @@ -326,7 +306,6 @@ topology_template:
requirements:
- database: cart_database
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -349,7 +328,6 @@ topology_template:
- dbms_password: {get_input: dbms_password}
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudsql
artifacts:
- dbms_image:
Expand All @@ -371,7 +349,6 @@ topology_template:
- disable_profiler: '1'
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -395,7 +372,6 @@ topology_template:
requirements:
- product: product_component
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand All @@ -417,7 +393,6 @@ topology_template:
- disable_profiler: '1'
requirements:
- host: docker_engine
- host: kubernetes_cluster
- host: gcp_cloudrun
artifacts:
- docker_image:
Expand Down Expand Up @@ -539,23 +514,3 @@ topology_template:
- gcp_region: {get_input: gcp_region}
- gcp_service_account_file: {get_input: gcp_service_account_file}
- gcp_project: {get_input: gcp_project}

###################################################
#
# Kubernetes
#
###################################################

kubernetes_cluster:
type: kubernetes.cluster
conditions: {logic_expression: is_kubernetes}
properties:
- k8s_host: {get_input: k8s_host}
- k8s_ca_cert_file: {get_input: k8s_ca_cert_file}
- k8s_client_cert_file: {get_input: k8s_client_cert_file}
- k8s_client_key_file: {get_input: k8s_client_key_file}
requirements:
- host: kubernetes_provider

kubernetes_provider:
type: cloud.provider
3 changes: 0 additions & 3 deletions examples/unfurl-technology---boutique---plus-original-manual/variable-service-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ topology_template:
type: boolean
default: false

options:
enrich_technologies: false

node_templates:
###################################################
#
Expand Down
Loading