From eab0048b3c2af004586a595a8e25acb9301ae869 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 May 2024 13:19:16 +0900 Subject: [PATCH 1/9] chore: fix extra node creation --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 02720649fb4f..ad642258325e 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-sn-1 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-1 diff --git a/go.sum b/go.sum index 7a1720cf039b..950567a52c0f 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-sn-1 h1:fjpHAcN1O5Ovm+VpsYVsw3rY2RzU0JPkNP1D0DiUcUw= -github.com/smartnews/karpenter v0.36.0-sn-1/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-sn-test h1:dzNAEC04iK9H9caj27UeU7g3YS255YCw8tqvid0Q1So= +github.com/smartnews/karpenter v0.36.0-sn-test/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From 3410cd92695ba7df8d9b88d468ee7eef8c7bde84 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 May 2024 13:46:08 +0900 Subject: [PATCH 2/9] bump version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ad642258325e..368cbd94e324 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-1 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-2 diff --git a/go.sum b/go.sum index 950567a52c0f..1d0875d87285 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-sn-test h1:dzNAEC04iK9H9caj27UeU7g3YS255YCw8tqvid0Q1So= -github.com/smartnews/karpenter v0.36.0-sn-test/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-2 h1:mtAyipQ1ZWVHUohQXtZ+Z0vXZQhZ5mZwCHAAXIzhyng= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-2/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From 76ffd9009c61a97a0a34e7b7d0ee5cf7e28b9f40 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 May 2024 15:46:07 +0900 Subject: [PATCH 3/9] bump up version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 368cbd94e324..e510edcb28bd 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-2 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-3 From a2dd67e68b3f11b0fae63f2085bf5cba766a2d76 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 13 May 2024 15:47:01 +0900 Subject: [PATCH 4/9] bump up version --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 1d0875d87285..7a348dd905bd 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-2 h1:mtAyipQ1ZWVHUohQXtZ+Z0vXZQhZ5mZwCHAAXIzhyng= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-2/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-3 h1:m3BFZ+5PwLDsY9IURu29KPaPeZWpTMVqjiYcyrqzfhE= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-3/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From eea287519a3c8db4810d382edd436746be1794d3 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 16 May 2024 12:42:11 +0900 Subject: [PATCH 5/9] bump up version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e510edcb28bd..48f9a8b2c344 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-3 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-4 diff --git a/go.sum b/go.sum index 7a348dd905bd..3f7d513e74f7 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-3 h1:m3BFZ+5PwLDsY9IURu29KPaPeZWpTMVqjiYcyrqzfhE= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-3/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-4 h1:Mw8M3oimRrzgUAEHzKIWEXPvS4F6Gi3tXBjFWJb+40E= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-4/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From daa584dc8bb3667f97a688c36c1bd459426dfb06 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 16 May 2024 13:49:26 +0900 Subject: [PATCH 6/9] debug --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 48f9a8b2c344..ea33d14234b2 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-4 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-5 diff --git a/go.sum b/go.sum index 3f7d513e74f7..412cffc6bf50 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-4 h1:Mw8M3oimRrzgUAEHzKIWEXPvS4F6Gi3tXBjFWJb+40E= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-4/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-5 h1:IFJ8V6VC5dHcYsUBpwTx6p4OWKdJo0fFYgXtSLThdBg= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-5/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From 2b6b498308af6b00425092c79458c16da5e4b284 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 20 May 2024 13:44:19 +0900 Subject: [PATCH 7/9] add debug log --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ea33d14234b2..2f66ad7975ca 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-5 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-6 From 1abaab8b5396a45866d053ad9be3036df35d9a51 Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 20 May 2024 14:17:34 +0900 Subject: [PATCH 8/9] fix event list --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f66ad7975ca..43074eb40819 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-6 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-7 diff --git a/go.sum b/go.sum index 412cffc6bf50..bc6b3c6eac62 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-5 h1:IFJ8V6VC5dHcYsUBpwTx6p4OWKdJo0fFYgXtSLThdBg= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-5/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-7 h1:ceHK9nUa/VJhonuJdSQEdSmoJG+5iuMY/Qt3TMZDCYY= +github.com/smartnews/karpenter v0.36.0-fix-extra-node-7/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= From 91053d48581b97546abd7e236ed33621b8ea322d Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 23 May 2024 10:45:42 +0900 Subject: [PATCH 9/9] chore: fix extra node issue --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 43074eb40819..d1beb8f96b5d 100644 --- a/go.mod +++ b/go.mod @@ -116,4 +116,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-fix-extra-node-7 +replace sigs.k8s.io/karpenter v0.36.0 => github.com/smartnews/karpenter v0.36.0-sn-2 diff --git a/go.sum b/go.sum index bc6b3c6eac62..25e235ecc666 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXn github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-7 h1:ceHK9nUa/VJhonuJdSQEdSmoJG+5iuMY/Qt3TMZDCYY= -github.com/smartnews/karpenter v0.36.0-fix-extra-node-7/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= +github.com/smartnews/karpenter v0.36.0-sn-2 h1:OxCO1zuLbG3M18RdeQ7JWO9Lt3hxKDTCN853/qQYiLQ= +github.com/smartnews/karpenter v0.36.0-sn-2/go.mod h1:fieFojxOec/l0tDmFT7R+g/Y+SGQbL9VlcYO8xb3sLo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=