Skip to content

Remove keikoproj/aws-sdk-go-cache dependency #550

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

Draft
tekenstam wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove keikoproj/aws-sdk-go-cache dependency #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions controllers/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"k8s.io/kubectl/pkg/scheme"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/keikoproj/aws-sdk-go-cache/cache"
"github.com/keikoproj/upgrade-manager/api/v1alpha1"
awsprovider "github.com/keikoproj/upgrade-manager/controllers/providers/aws"
kubeprovider "github.com/keikoproj/upgrade-manager/controllers/providers/kubernetes"
Expand Down Expand Up @@ -67,9 +66,8 @@ func createRollingUpgradeReconciler(t *testing.T, objects ...runtime.Object) *Ro
DrainErrorMapper: &sync.Map{},
ReplacementNodesMap: &sync.Map{},
ReconcileMap: &sync.Map{},
AdmissionMap: sync.Map{},
CacheConfig: cache.NewConfig(0, 0, 0, 0),
ClusterNodesMap: &sync.Map{},
AdmissionMap: sync.Map{},
ClusterNodesMap: &sync.Map{},
}

// Pre-populate ClusterNodesMap to avoid kubeconfig dependency in tests
Expand Down
4 changes: 0 additions & 4 deletions controllers/rollingupgrade_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"sync"

"github.com/go-logr/logr"
"github.com/keikoproj/aws-sdk-go-cache/cache"
"github.com/keikoproj/upgrade-manager/api/v1alpha1"
"github.com/keikoproj/upgrade-manager/controllers/common"
"github.com/keikoproj/upgrade-manager/controllers/common/log"
Expand All @@ -45,7 +44,6 @@ type RollingUpgradeReconciler struct {
logr.Logger
Scheme *runtime.Scheme
AdmissionMap sync.Map
CacheConfig *cache.Config
EventWriter *kubeprovider.EventWriter
maxParallel int
ScriptRunner ScriptRunner
Expand Down Expand Up @@ -181,8 +179,6 @@ func (r *RollingUpgradeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
// store the rolling upgrade in admission map
if _, present := r.AdmissionMap.LoadOrStore(rollingUpgrade.NamespacedName(), scalingGroupName); !present {
r.Info("admitted new rolling upgrade", "scalingGroup", scalingGroupName, "update strategy", rollingUpgrade.Spec.Strategy, "name", rollingUpgrade.NamespacedName())
r.CacheConfig.FlushCache("autoscaling")
r.CacheConfig.FlushCache("ec2")
} else {
r.Info("operating on existing rolling upgrade", "scalingGroup", scalingGroupName, "update strategy", rollingUpgrade.Spec.Strategy, "name", rollingUpgrade.NamespacedName())
}
Expand Down
3 changes: 0 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.24
require (
github.com/aws/aws-sdk-go v1.55.6
github.com/go-logr/logr v1.4.3
github.com/keikoproj/aws-sdk-go-cache v0.1.0
github.com/onsi/gomega v1.37.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.22.0
Expand Down Expand Up @@ -38,7 +37,6 @@ require (
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.4 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
Expand All @@ -52,7 +50,6 @@ require (
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/karlseguin/ccache/v2 v2.0.8 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
Expand Down
10 changes: 0 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
Expand Down Expand Up @@ -86,12 +84,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/karlseguin/ccache/v2 v2.0.8 h1:lT38cE//uyf6KcFok0rlgXtGFBWxkI6h/qg4tbFyDnA=
github.com/karlseguin/ccache/v2 v2.0.8/go.mod h1:2BDThcfQMf/c0jnZowt16eW405XIqZPavt+HoYEtcxQ=
github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003 h1:vJ0Snvo+SLMY72r5J4sEfkuE7AFbixEP2qRbEcum/wA=
github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003/go.mod h1:zNBxMY8P21owkeogJELCLeHIt+voOSduHYTFUbwRAV8=
github.com/keikoproj/aws-sdk-go-cache v0.1.0 h1:XEDzjrXFmnSnNuzqMW128Bs0PzjeR6WCyU30Fl3JBag=
github.com/keikoproj/aws-sdk-go-cache v0.1.0/go.mod h1:Ne0kppOb8GyXT7RVvKtYJm6UjqaYruPt6woaFIuuQe8=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
Expand Down Expand Up @@ -170,8 +162,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ=
github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
Expand Down
29 changes: 3 additions & 26 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/go-logr/logr"
"github.com/keikoproj/aws-sdk-go-cache/cache"
upgrademgrv1alpha1 "github.com/keikoproj/upgrade-manager/api/v1alpha1"
"github.com/keikoproj/upgrade-manager/controllers"
"github.com/keikoproj/upgrade-manager/controllers/common/log"
Expand All @@ -60,14 +59,6 @@ var (
setupLog = ctrl.Log.WithName("main")
)

var (
CacheDefaultTTL = time.Second * 0
DescribeAutoScalingGroupsTTL = 60 * time.Second
DescribeLaunchTemplatesTTL = 60 * time.Second
CacheMaxItems int64 = 5000
CacheItemsToPrune uint32 = 500
)

func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))

Expand Down Expand Up @@ -167,19 +158,6 @@ func main() {
os.Exit(1)
}

cacheCfg := cache.NewConfig(CacheDefaultTTL, 1*time.Hour, CacheMaxItems, CacheItemsToPrune)
cache.AddCaching(sess, cacheCfg)
cacheCfg.SetCacheTTL("autoscaling", "DescribeAutoScalingGroups", DescribeAutoScalingGroupsTTL)
cacheCfg.SetCacheTTL("ec2", "DescribeLaunchTemplates", DescribeLaunchTemplatesTTL)
sess.Handlers.Complete.PushFront(func(r *request.Request) {
ctx := r.HTTPRequest.Context()
log.Debugf("cache hit => %v, service => %s.%s",
cache.IsCacheHit(ctx),
r.ClientInfo.ServiceName,
r.Operation.Name,
)
})

kube, err := kubeprovider.GetKubernetesClient()
if err != nil {
setupLog.Error(err, "unable to create kubernetes client")
Expand All @@ -198,10 +176,9 @@ func main() {
logger := ctrl.Log.WithName("controllers").WithName("RollingUpgrade")

reconciler := &controllers.RollingUpgradeReconciler{
Client: mgr.GetClient(),
Logger: logger,
Scheme: mgr.GetScheme(),
CacheConfig: cacheCfg,
Client: mgr.GetClient(),
Logger: logger,
Scheme: mgr.GetScheme(),
Auth: &controllers.RollingUpgradeAuthenticator{
AmazonClientSet: awsClient,
KubernetesClientSet: kubeClient,
Expand Down
Loading