Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit b51f6ab

Browse files
ocofaighocofaigh
authored
Remove agents variation from the DA (#239)
1 parent 0f552cf commit b51f6ab

24 files changed

+3
-884
lines changed

‎.catalog-onboard-pipeline.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ offerings:
1212
scc:
1313
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
1414
region: us-south
15-
- name: agents
16-
mark_ready: true
17-
install_type: extension
18-
pre_validation: "tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh"
19-
post_validation: "tests/scripts/post-validation-destroy-slz-roks-and-scc-wp-instances.sh"

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
[![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
77
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
88

9-
This repository contains the following infrastructure as code solutions:
9+
This repository contains the following infrastructure as code solution:
1010
- [Security and Compliance Center instances solution](./solutions/instances)
11-
- [Security and Compliance Center Workload Protection agents solution](./solutions/agents)
1211

13-
:exclamation: **Important:** These solutions are not intended to be called by other modules because they contain a provider configuration and are not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers)
12+
:exclamation: **Important:** This solution is not intended to be called by other modules because it contains a provider configuration and is not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers)
1413

1514
<!-- Leave this section as is so that your module has a link to local development environment set up steps for contributors to follow -->
1615
## Contributing

‎ibm_catalog.json‎

Lines changed: 0 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -360,175 +360,6 @@
360360
}
361361
]
362362
}
363-
},
364-
{
365-
"label": "Agents",
366-
"name": "agents",
367-
"install_type": "extension",
368-
"working_directory": "solutions/agents",
369-
"compliance": {},
370-
"dependencies": [
371-
{
372-
"flavors": [
373-
"quickstart",
374-
"standard"
375-
],
376-
"id": "95fccffc-ae3b-42df-b6d9-80be5914d852-global",
377-
"name": "deploy-arch-ibm-slz-ocp",
378-
"version": ">=v3.0.0",
379-
"optional": true
380-
},
381-
{
382-
"flavors": [
383-
"instances"
384-
],
385-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
386-
"id": "9423f9bc-1290-4c71-a9ac-01898bfa7ccc-global",
387-
"name": "deploy-arch-ibm-scc",
388-
"version": ">=v1.0.0",
389-
"optional": true
390-
}
391-
],
392-
"configuration": [
393-
{
394-
"key": "ibmcloud_api_key"
395-
},
396-
{
397-
"key": "provider_visibility",
398-
"options": [
399-
{
400-
"displayname": "private",
401-
"value": "private"
402-
},
403-
{
404-
"displayname": "public",
405-
"value": "public"
406-
},
407-
{
408-
"displayname": "public-and-private",
409-
"value": "public-and-private"
410-
}
411-
]
412-
},
413-
{
414-
"key": "name"
415-
},
416-
{
417-
"key": "namespace"
418-
},
419-
{
420-
"key": "cluster_id",
421-
"custom_config": {
422-
"type": "cluster_var",
423-
"grouping": "deployment",
424-
"original_grouping": "deployment"
425-
}
426-
},
427-
{
428-
"key": "cluster_resource_group_id",
429-
"custom_config": {
430-
"type": "resource_group",
431-
"grouping": "deployment",
432-
"original_grouping": "deployment",
433-
"config_constraints": {
434-
"identifier": "rg_id"
435-
}
436-
}
437-
},
438-
{
439-
"key": "access_key"
440-
},
441-
{
442-
"key": "region",
443-
"type": "string",
444-
"custom_config": {
445-
"type": "region",
446-
"grouping": "deployment",
447-
"original_grouping": "deployment",
448-
"config_constraints": {
449-
"showKinds": [
450-
"region"
451-
]
452-
}
453-
}
454-
},
455-
{
456-
"key": "endpoint_type",
457-
"options": [
458-
{
459-
"displayname": "Public",
460-
"value": "public"
461-
},
462-
{
463-
"displayname": "Private",
464-
"value": "private"
465-
}
466-
]
467-
},
468-
{
469-
"key": "deployment_tag"
470-
},
471-
{
472-
"key": "kspm_deploy"
473-
},
474-
{
475-
"key": "node_analyzer_deploy"
476-
},
477-
{
478-
"key": "host_scanner_deploy"
479-
},
480-
{
481-
"key": "cluster_scanner_deploy"
482-
},
483-
{
484-
"key": "cluster_endpoint_type",
485-
"options": [
486-
{
487-
"displayname": "Public",
488-
"value": "public"
489-
},
490-
{
491-
"displayname": "Private",
492-
"value": "private"
493-
}
494-
]
495-
}
496-
],
497-
"iam_permissions": [
498-
{
499-
"service_name": "compliance",
500-
"role_crns": [
501-
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
502-
"crn:v1:bluemix:public:iam::::role:Editor"
503-
]
504-
},
505-
{
506-
"service_name": "containers-kubernetes",
507-
"role_crns": [
508-
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
509-
"crn:v1:bluemix:public:iam::::role:Editor"
510-
]
511-
}
512-
],
513-
"architecture": {
514-
"descriptions": "This architecture supports creating and configuring Security and Compliance Center Workload Protection agents.",
515-
"features": [
516-
{
517-
"title": "Security and Compliance Center Workload Protection agent",
518-
"description": "Creates and configures a Security and Compliance Center Workload Protection agent."
519-
}
520-
],
521-
"diagrams": [
522-
{
523-
"diagram": {
524-
"caption": "Security and Compliance Center Workload Protection agent",
525-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-scc-da/main/reference-architecture/scc-wp-agent.svg",
526-
"type": "image/svg+xml"
527-
},
528-
"description": "This architecture supports creating and configuring Security and Compliance Center Workload Protection agent resources."
529-
}
530-
]
531-
}
532363
}
533364
]
534365
}

‎reference-architecture/scc-wp-agent.svg‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎renovate.json‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["github>terraform-ibm-modules/common-dev-assets:commonRenovateConfig"],
4-
"packageRules": [
5-
{
6-
"description": "Allow the locked in provider version to be updated to the latest for deployable architectures",
7-
"enabled": true,
8-
"matchFileNames": ["solutions/**"],
9-
"matchManagers": ["terraform"],
10-
"matchDepTypes": ["required_provider"],
11-
"rangeStrategy": "bump",
12-
"semanticCommitType": "fix",
13-
"group": true,
14-
"groupName": "required_provider",
15-
"commitMessageExtra": "to latest for the deployable architecture solution"
16-
}
17-
]
3+
"extends": ["github>terraform-ibm-modules/common-dev-assets:commonRenovateConfig"]
184
}

‎solutions/agents/README.md‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎solutions/agents/catalogValidationValues.json.template‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎solutions/agents/kubeconfig/.gitignore‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎solutions/agents/kubeconfig/README.md‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎solutions/agents/main.tf‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)