From 3c7cba973e5a1cd232ad4bc4032f16236007fb92 Mon Sep 17 00:00:00 2001 From: njtran Date: Wed, 4 Oct 2023 18:40:10 -0700 Subject: [PATCH 1/3] chore: update core --- cmd/controller/main.go | 1 - go.mod | 2 ++ go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 42fd747c51b9..fc6706430d71 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -45,7 +45,6 @@ func main() { op. WithControllers(ctx, corecontrollers.NewControllers( - ctx, op.Clock, op.GetClient(), op.KubernetesInterface, diff --git a/go.mod b/go.mod index 592531ff752d..83722e5a6b3b 100644 --- a/go.mod +++ b/go.mod @@ -111,3 +111,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +replace github.com/aws/karpenter-core => github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3 diff --git a/go.sum b/go.sum index 96562ece70d4..97d7da87ff91 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,6 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-sdk-go v1.45.19 h1:+4yXWhldhCVXWFOQRF99ZTJ92t4DtoHROZIbN7Ujk/U= github.com/aws/aws-sdk-go v1.45.19/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b h1:ZqqJrFe3TgONMeHzAhyenl5x583aHR4GUBukjQhsmP4= -github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644 h1:M1fxGlOfvSqFYI01HL2zzvomy8e7LiTHk77KDuChWZQ= github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644/go.mod h1:l/TIBsaCx/IrOr0Xvlj/cHLOf05QzuQKEZ1hx2XWmfU= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -267,6 +265,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3 h1:1Oyhyfbjykmcrz+R9RTyrVLC+ORQepOx7zPxiQMwePw= +github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= From bb7a3c2bc5525baf65d5c19f9d7666523f6b9fa1 Mon Sep 17 00:00:00 2001 From: njtran Date: Thu, 5 Oct 2023 14:10:40 -0700 Subject: [PATCH 2/3] updatecommit --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 83722e5a6b3b..fc4457e55b15 100644 --- a/go.mod +++ b/go.mod @@ -112,4 +112,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/aws/karpenter-core => github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3 +replace github.com/aws/karpenter-core => github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d diff --git a/go.sum b/go.sum index 97d7da87ff91..4497d4901471 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3 h1:1Oyhyfbjykmcrz+R9RTyrVLC+ORQepOx7zPxiQMwePw= -github.com/njtran/karpenter-core v0.0.0-20231005012325-0435aa3938c3/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= +github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d h1:hzPY2zAI8jSu7WzS2xGdwTM14zgyYR++zmHvnToy87c= +github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= From a27c3947e9a43d957a21444c9c4f8cafbe5b169d Mon Sep 17 00:00:00 2001 From: njtran Date: Fri, 6 Oct 2023 10:27:41 -0700 Subject: [PATCH 3/3] update core --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index fc4457e55b15..4f8180b00372 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/PuerkitoBio/goquery v1.8.1 github.com/avast/retry-go v3.0.0+incompatible github.com/aws/aws-sdk-go v1.45.19 - github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b + github.com/aws/karpenter-core v0.31.1-0.20231005232319-8e6687ea72b6 github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644 github.com/imdario/mergo v0.3.16 github.com/mitchellh/hashstructure/v2 v2.0.2 @@ -111,5 +111,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) - -replace github.com/aws/karpenter-core => github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d diff --git a/go.sum b/go.sum index 4497d4901471..6f6ccb53c6f5 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-sdk-go v1.45.19 h1:+4yXWhldhCVXWFOQRF99ZTJ92t4DtoHROZIbN7Ujk/U= github.com/aws/aws-sdk-go v1.45.19/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/karpenter-core v0.31.1-0.20231005232319-8e6687ea72b6 h1:2V3E9h5GUK7hB8setPdaUKcL/ubuDNoG0RAGQtvwfuE= +github.com/aws/karpenter-core v0.31.1-0.20231005232319-8e6687ea72b6/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644 h1:M1fxGlOfvSqFYI01HL2zzvomy8e7LiTHk77KDuChWZQ= github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644/go.mod h1:l/TIBsaCx/IrOr0Xvlj/cHLOf05QzuQKEZ1hx2XWmfU= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -265,8 +267,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d h1:hzPY2zAI8jSu7WzS2xGdwTM14zgyYR++zmHvnToy87c= -github.com/njtran/karpenter-core v0.0.0-20231005200924-adee7acda11d/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA=