@@ -28,7 +28,6 @@ import (
28
28
"gopkg.in/yaml.v3"
29
29
30
30
"github.com/aws/amazon-cloudwatch-agent/cfg/envconfig"
31
- "github.com/aws/amazon-cloudwatch-agent/internal/tls"
32
31
)
33
32
34
33
var (
@@ -50,8 +49,6 @@ type TargetAllocatorManager struct {
50
49
sm * scrape.Manager
51
50
dm * discovery.Manager
52
51
logger log.Logger
53
- configFile string
54
- certWatcher * tls.CertWatcher
55
52
}
56
53
57
54
func isPodNameAvailable () bool {
@@ -113,7 +110,6 @@ func createTargetAllocatorManager(filename string, logger log.Logger, logLevel *
113
110
taReadyCh : make (chan struct {}, 1 ),
114
111
reloadConfigHandler : nil ,
115
112
logger : logger ,
116
- configFile : filename ,
117
113
}
118
114
err := tam .loadConfig (filename )
119
115
if err != nil {
@@ -146,27 +142,6 @@ func (tam *TargetAllocatorManager) loadManager(logLevel *promlog.AllowedLevel) {
146
142
}
147
143
148
144
tam .manager = tamanager .NewManager (receiverSettings , tam .config .TargetAllocator , (* promconfig .Config )(tam .config .PrometheusConfig ), false )
149
-
150
- cw , err := tls .NewCertWatcher (
151
- tam .config .TargetAllocator .TLSSetting .CertFile ,
152
- tam .config .TargetAllocator .TLSSetting .KeyFile ,
153
- tam .config .TargetAllocator .TLSSetting .CAFile ,
154
- logger ,
155
- )
156
- if err != nil {
157
- level .Error (tam .logger ).Log ("msg" , "failed to create certWatcher" , "err" , err )
158
- } else {
159
- cw .RegisterCallback (func () {
160
- level .Info (tam .logger ).Log ("msg" , "CertWatcher detected certificate update, reloading TLS configuration" )
161
- tam .updateTLSConfig ()
162
- })
163
- tam .certWatcher = cw
164
- go func () {
165
- if err := cw .Start (context .Background ()); err != nil {
166
- level .Error (tam .logger ).Log ("msg" , "certWatcher encountered error" , "err" , err )
167
- }
168
- }()
169
- }
170
145
}
171
146
func (tam * TargetAllocatorManager ) loadConfig (filename string ) error {
172
147
config , err := loadConfigFromFilename (filename )
@@ -232,16 +207,3 @@ func (tam *TargetAllocatorManager) reloadConfigTicker() error {
232
207
}()
233
208
return nil
234
209
}
235
-
236
- func (tam * TargetAllocatorManager ) updateTLSConfig () {
237
- newCfg , err := loadConfigFromFilename (tam .configFile )
238
- if err != nil {
239
- level .Error (tam .logger ).Log ("msg" , "failed to reload config in updateTLSConfig" , "err" , err )
240
- return
241
- }
242
- newCfg .TargetAllocator .TLSSetting .CAFile = DefaultTLSCaFilePath
243
- newCfg .TargetAllocator .TLSSetting .CertFile = DefaultTLSCertFilePath
244
- newCfg .TargetAllocator .TLSSetting .KeyFile = DefaultTLSKeyFilePath
245
- tam .config = newCfg
246
- level .Info (tam .logger ).Log ("msg" , "TLS configuration updated from certWatcher" )
247
- }
0 commit comments