Skip to content

Commit

Permalink
refactor!: Remove system management agent and executor (#4265)
Browse files Browse the repository at this point in the history
* refactor!: Remove system management agent and executor

BREAKING CHANGE: SMA is deprecated in EdgeX 3.0

Signed-off-by: Bryon Nevis <bryon.nevis@intel.com>

* refactor(snap)!: Remove obsolete sma references and wrapper script

Signed-off-by: Farshid Tavakolizadeh <farshid.tavakolizadeh@canonical.com>

Signed-off-by: Bryon Nevis <bryon.nevis@intel.com>
Signed-off-by: Farshid Tavakolizadeh <farshid.tavakolizadeh@canonical.com>
Co-authored-by: Farshid Tavakolizadeh <farshid.tavakolizadeh@canonical.com>
  • Loading branch information
bnevis-i and farshidtz authored Jan 6, 2023
1 parent c6d570f commit 91e411a
Show file tree
Hide file tree
Showing 41 changed files with 2 additions and 2,700 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ cmd/security-secretstore-setup/security-secretstore-setup
cmd/support-logging/support-logging
cmd/support-notifications/support-notifications
cmd/support-scheduler/support-scheduler
cmd/sys-mgmt-agent/sys-mgmt-agent
cmd/sys-mgmt-executor/sys-mgmt-executor
cmd/secrets-config/secrets-config
cmd/security-bootstrapper/security-bootstrapper
cmd/security-spiffe-token-provider/security-spiffe-token-provider
Expand Down
20 changes: 0 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ DOCKERS= \
docker_core_metadata \
docker_core_command \
docker_support_notifications \
docker_sys_mgmt_agent \
docker_support_scheduler \
docker_security_proxy_setup \
docker_security_secretstore_setup \
Expand All @@ -36,8 +35,6 @@ MICROSERVICES= \
cmd/core-metadata/core-metadata \
cmd/core-command/core-command \
cmd/support-notifications/support-notifications \
cmd/sys-mgmt-executor/sys-mgmt-executor \
cmd/sys-mgmt-agent/sys-mgmt-agent \
cmd/support-scheduler/support-scheduler \
cmd/security-proxy-setup/security-proxy-setup \
cmd/security-secretstore-setup/security-secretstore-setup \
Expand Down Expand Up @@ -109,12 +106,6 @@ scheduler: cmd/support-scheduler/support-scheduler
cmd/support-scheduler/support-scheduler:
$(GO) build -tags "$(ADD_BUILD_TAGS) $(NON_DELAYED_START_GO_BUILD_TAG_FOR_SUPPORT)" $(GOFLAGS) -o $@ ./cmd/support-scheduler

cmd/sys-mgmt-executor/sys-mgmt-executor:
$(GO) build -tags "$(NO_MESSAGEBUS_GO_BUILD_TAG) $(NON_DELAYED_START_GO_BUILD_TAG_FOR_CORE)" $(GOFLAGS) -o $@ ./cmd/sys-mgmt-executor

cmd/sys-mgmt-agent/sys-mgmt-agent:
$(GO) build -tags "$(NO_MESSAGEBUS_GO_BUILD_TAG) $(NON_DELAYED_START_GO_BUILD_TAG_FOR_CORE)" $(GOFLAGS) -o $@ ./cmd/sys-mgmt-agent

proxy: cmd/security-proxy-setup/security-proxy-setup
cmd/security-proxy-setup/security-proxy-setup:
$(GO) build -tags "$(NO_MESSAGEBUS_GO_BUILD_TAG) $(NON_DELAYED_START_GO_BUILD_TAG_FOR_CORE)" $(GOFLAGS) -o ./cmd/security-proxy-setup/security-proxy-setup ./cmd/security-proxy-setup
Expand Down Expand Up @@ -248,17 +239,6 @@ docker_support_scheduler: docker_base
-t edgexfoundry/support-scheduler:$(DOCKER_TAG) \
.

docker_sys_mgmt_agent: docker_base
docker build \
--build-arg http_proxy \
--build-arg https_proxy \
--build-arg BUILDER_BASE=$(LOCAL_CACHE_IMAGE) \
-f cmd/sys-mgmt-agent/Dockerfile \
--label "git_sha=$(GIT_SHA)" \
-t edgexfoundry/sys-mgmt-agent:$(GIT_SHA) \
-t edgexfoundry/sys-mgmt-agent:$(DOCKER_TAG) \
.

dproxy: docker_security_proxy_setup
docker_security_proxy_setup: docker_base
docker build \
Expand Down
2 changes: 0 additions & 2 deletions cmd/security-bootstrapper/res/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ LogLevel = "INFO"
Description = "role for notifications"
[StageGate.Registry.ACL.Roles.support-scheduler]
Description = "role for scheduler"
[StageGate.Registry.ACL.Roles.sys-mgmt-agent]
Description = "role for system management agent"
[StageGate.Registry.ACL.Roles.device-virtual]
Description = "role for device virtual service"
[StageGate.Registry.ACL.Roles.device-rest]
Expand Down
3 changes: 0 additions & 3 deletions cmd/security-file-token-provider/res/token-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
"device-rest": {
"edgex_use_defaults": true
},
"sys-mgmt-agent": {
"edgex_use_defaults": true
},
"support-scheduler": {
"edgex_use_defaults": true
},
Expand Down
6 changes: 0 additions & 6 deletions cmd/security-proxy-setup/res/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ ServerName = ""
Host = "localhost"
Port = 59861

[Routes.sys-mgmt-agent]
Name = "sys-mgmt-agent"
Protocol = "http"
Host = "localhost"
Port = 58890

[Routes.rules-engine]
Name = "rules-engine"
Protocol = "http"
Expand Down
50 changes: 0 additions & 50 deletions cmd/sys-mgmt-agent/Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions cmd/sys-mgmt-agent/main.go

This file was deleted.

84 changes: 0 additions & 84 deletions cmd/sys-mgmt-agent/res/configuration.toml

This file was deleted.

41 changes: 0 additions & 41 deletions cmd/sys-mgmt-executor/main.go

This file was deleted.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3
github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1
github.com/fxamacker/cbor/v2 v2.4.0
github.com/golang-jwt/jwt/v4 v4.4.3
Expand All @@ -29,6 +28,7 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand Down
11 changes: 0 additions & 11 deletions internal/system/agent/application/const.go

This file was deleted.

Loading

0 comments on commit 91e411a

Please sign in to comment.