Skip to content

Commit 7bbbd8a

Browse files
committed
[test] remove preferences field in kubeConfig
This commit reacts to the new default in kube 1.34 where the newer version of client-go's kubeconfig structure no longer includes the preferences field in its JSON output at serialization.
1 parent 4b67fd4 commit 7bbbd8a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/nodeconfig/nodeconfig_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestNewKubeConfigFromSecret(t *testing.T) {
2525
core.ServiceAccountTokenKey: []byte("AAAAB3NzaC1yc2EAAAADAQABAAACAQDaJEjsx1sOoRh+vT3UXIspVBlnqswPFXUv4DeOwA9iM/++CrIqRZQNge760WzBOLXMq6J6FHw/w5seim3oCpdFa54JmZsJMFBx8u56Hg9JZdjtKk36kpSvu53Moiit8/aTQyzKZZht+n+xxaby7b4XXM/MCNhvHERsbX36LLlK1BU+45037ePGmCwgjk+rHUjHHWHFhPG7mtXIiI/7CMt5mV03CkxflryU9iWNkYWl4vgy6NaYolfAgdlX4ryvEjBKx6HywllQsmK4AmoQyAErwKvurWrHn1zFellNBK5r2vvMTpPufdJN7yDERmFeOsucxZzvpESu5jVys1PFUJmyA8W0h3Xbq4IrxTGm0xhYmt2HNWQ8i840jD7ZKVq6RIpeiVOn60Ha0pVDBZfyWMOVZAeF3mV8g8gI9WkJDJHXkwhOZn5P3D7sv3ABuI3u3xzXQiLQgpAEuZzMB1NwDR8Rz9csRfxRHd1Nl6oYOGT583qPpBQsXrTI9kINpCAVDH7k+qS+IwCIq6soczUUYgXNWCafwdiqPSZOZCOnnTmJ9+SLFHAaa4sHlEhdekfPND4riKYIpZwlsU87aN2tGWZDcRPX/6di3opTx5B68izGKBWgKgF5XcpSH5e2dSqhnA1QjLMUDIZZ0hMIC1HjGTY6mkHXsS3FD79vKi+SX8jTLw=="),
2626
},
2727
},
28-
expectedSpec: "{\"preferences\":{},\"clusters\":[{\"name\":\"local\",\"cluster\":{\"server\":\"\",\"certificate-authority-data\":\"LS0tLS1CRUdJTiUyMENFUlRJRklDQVRFLS0tLS0lMEFNSUlEQ1RDQ0FmR2dBd0lCQWdJQkFEQU5CZ2txaGtpRzl3MEJBUXNGQURBbU1SSXdFQVlEVlFRTEV3bHZjR1Z1JTBBYzJocFpuUXhFREFPQmdOVkJBTVRCM0p2YjNRdFkyRXdIaGNOTVRneE1ESTBNVGMwTmpFMFdoY05Namd4TURJeCUwQU1UYzBOakUwV2pBbU1SSXdFQVlEVlFRTEV3bHZjR1Z1YzJocFpuUXhFREFPQmdOVkJBTVRCM0p2YjNRdFkyRXclMEFnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdjhFZ09aJTJCdmV4REprcG1FUHVJVnYlMEFDSnR2YUo5VEVncEQ0ZDBtTjFOJTJGMmcwR1dXUDFzTk04bHh6dHlBM21oYWhOa0hMQVlSU2NZalVSS2xhYXJYZ28lMEEwJTJCbk0yckVra0VDbjRvN1RBZXRIbUJkMiUyRkZnVjNwZVR1Y1ZSSVdWODAxUVpNbVA5dndDYTR5UGkyTDhFejM3ayUwQTJScGVwZWVTVkl2SEFSejclMkJIYk1IdTVjWGF1UFJhelNGa28wNVAyeTBWZ3ZkaFJ6WDZ6bThEanBwTFFJSHFUSCUwQWt2c0l3RVh3c1E4R2pVbmxxblloRG5JJTJGMXNURzNTVlIzJTJGYkNvYmlxNU4ySkg5d0tJZkl0ODlLYk5QZkU3ZUgxJTBBY1Rjc1MxYWRQTW5BVnJ2aUVZazl1a2ViZDNwYzlnREZVYnhoRUpMbk1vODE1c3k5TyUyRnl5clBHJTJGM1hmamZuNFolMEFBZ01CQUFHalFqQkFNQTRHQTFVZER3RUIlMkZ3UUVBd0lDcERBUEJnTlZIUk1CQWY4RUJUQURBUUglMkZNQjBHQTFVZCUwQURnUVdCQlJSS2tTMlpMUW90SjJmdDRvJTJCMXhmN2hyTTE3REFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBajcyWSUwQUhJTE1mNTklMkJjcSUyQmtIY3dpekZKazVkaiUyRlFhTjVCd2Uwd1QxbiUyRmpuZXlWMklTeklDNU5WYndjblAyRGdaV1ZPVCUwQXJ4QSUyQklCdUtIJTJGWGJqemFEcGFoZ3RuSzF5cU9ialNBenNkejdEZHN0ZHByaXFEMFlqQlFnMjNkNWlkcnd5RWVwJTBBRjclMkZ2ZFRmV2pBWmtEcnN6T0NyJTJCaldzcnNDTFVEaUJmNDN1MUI5UnV1cUNzbDFiRlZBSENLN0dqMmNNQlhKSGQlMEFqQzQlMkJPYVpZNFRVaG1TWklpMW55aWllNzlqTUtSRmlIdE0xUCUyQkVSbGpUNDg5OWZhR29HYkVIRGxZbjc1SHZRQSUwQU0xWWlmMFZDdHppJTJCNnhuS0RaNU8zd3Z4Y3RRVHRtYjlheUwxMWQxR1QlMkZPck05SUkwVUF0b2RJanB4Qm8lMkJZN24lMEF1NGslMkJRU1h3bE9mcURTaXh3QSUzRCUzRCUwQS0tLS0tRU5EJTIwQ0VSVElGSUNBVEUtLS0tLSUwQQ==\"}}],\"users\":[{\"name\":\"kubelet\",\"user\":{\"token\":\"AAAAB3NzaC1yc2EAAAADAQABAAACAQDaJEjsx1sOoRh+vT3UXIspVBlnqswPFXUv4DeOwA9iM/++CrIqRZQNge760WzBOLXMq6J6FHw/w5seim3oCpdFa54JmZsJMFBx8u56Hg9JZdjtKk36kpSvu53Moiit8/aTQyzKZZht+n+xxaby7b4XXM/MCNhvHERsbX36LLlK1BU+45037ePGmCwgjk+rHUjHHWHFhPG7mtXIiI/7CMt5mV03CkxflryU9iWNkYWl4vgy6NaYolfAgdlX4ryvEjBKx6HywllQsmK4AmoQyAErwKvurWrHn1zFellNBK5r2vvMTpPufdJN7yDERmFeOsucxZzvpESu5jVys1PFUJmyA8W0h3Xbq4IrxTGm0xhYmt2HNWQ8i840jD7ZKVq6RIpeiVOn60Ha0pVDBZfyWMOVZAeF3mV8g8gI9WkJDJHXkwhOZn5P3D7sv3ABuI3u3xzXQiLQgpAEuZzMB1NwDR8Rz9csRfxRHd1Nl6oYOGT583qPpBQsXrTI9kINpCAVDH7k+qS+IwCIq6soczUUYgXNWCafwdiqPSZOZCOnnTmJ9+SLFHAaa4sHlEhdekfPND4riKYIpZwlsU87aN2tGWZDcRPX/6di3opTx5B68izGKBWgKgF5XcpSH5e2dSqhnA1QjLMUDIZZ0hMIC1HjGTY6mkHXsS3FD79vKi+SX8jTLw==\"}}],\"contexts\":[{\"name\":\"kubelet\",\"context\":{\"cluster\":\"local\",\"user\":\"kubelet\"}}],\"current-context\":\"kubelet\"}",
28+
expectedSpec: "{\"clusters\":[{\"name\":\"local\",\"cluster\":{\"server\":\"\",\"certificate-authority-data\":\"LS0tLS1CRUdJTiUyMENFUlRJRklDQVRFLS0tLS0lMEFNSUlEQ1RDQ0FmR2dBd0lCQWdJQkFEQU5CZ2txaGtpRzl3MEJBUXNGQURBbU1SSXdFQVlEVlFRTEV3bHZjR1Z1JTBBYzJocFpuUXhFREFPQmdOVkJBTVRCM0p2YjNRdFkyRXdIaGNOTVRneE1ESTBNVGMwTmpFMFdoY05Namd4TURJeCUwQU1UYzBOakUwV2pBbU1SSXdFQVlEVlFRTEV3bHZjR1Z1YzJocFpuUXhFREFPQmdOVkJBTVRCM0p2YjNRdFkyRXclMEFnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdjhFZ09aJTJCdmV4REprcG1FUHVJVnYlMEFDSnR2YUo5VEVncEQ0ZDBtTjFOJTJGMmcwR1dXUDFzTk04bHh6dHlBM21oYWhOa0hMQVlSU2NZalVSS2xhYXJYZ28lMEEwJTJCbk0yckVra0VDbjRvN1RBZXRIbUJkMiUyRkZnVjNwZVR1Y1ZSSVdWODAxUVpNbVA5dndDYTR5UGkyTDhFejM3ayUwQTJScGVwZWVTVkl2SEFSejclMkJIYk1IdTVjWGF1UFJhelNGa28wNVAyeTBWZ3ZkaFJ6WDZ6bThEanBwTFFJSHFUSCUwQWt2c0l3RVh3c1E4R2pVbmxxblloRG5JJTJGMXNURzNTVlIzJTJGYkNvYmlxNU4ySkg5d0tJZkl0ODlLYk5QZkU3ZUgxJTBBY1Rjc1MxYWRQTW5BVnJ2aUVZazl1a2ViZDNwYzlnREZVYnhoRUpMbk1vODE1c3k5TyUyRnl5clBHJTJGM1hmamZuNFolMEFBZ01CQUFHalFqQkFNQTRHQTFVZER3RUIlMkZ3UUVBd0lDcERBUEJnTlZIUk1CQWY4RUJUQURBUUglMkZNQjBHQTFVZCUwQURnUVdCQlJSS2tTMlpMUW90SjJmdDRvJTJCMXhmN2hyTTE3REFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBajcyWSUwQUhJTE1mNTklMkJjcSUyQmtIY3dpekZKazVkaiUyRlFhTjVCd2Uwd1QxbiUyRmpuZXlWMklTeklDNU5WYndjblAyRGdaV1ZPVCUwQXJ4QSUyQklCdUtIJTJGWGJqemFEcGFoZ3RuSzF5cU9ialNBenNkejdEZHN0ZHByaXFEMFlqQlFnMjNkNWlkcnd5RWVwJTBBRjclMkZ2ZFRmV2pBWmtEcnN6T0NyJTJCaldzcnNDTFVEaUJmNDN1MUI5UnV1cUNzbDFiRlZBSENLN0dqMmNNQlhKSGQlMEFqQzQlMkJPYVpZNFRVaG1TWklpMW55aWllNzlqTUtSRmlIdE0xUCUyQkVSbGpUNDg5OWZhR29HYkVIRGxZbjc1SHZRQSUwQU0xWWlmMFZDdHppJTJCNnhuS0RaNU8zd3Z4Y3RRVHRtYjlheUwxMWQxR1QlMkZPck05SUkwVUF0b2RJanB4Qm8lMkJZN24lMEF1NGslMkJRU1h3bE9mcURTaXh3QSUzRCUzRCUwQS0tLS0tRU5EJTIwQ0VSVElGSUNBVEUtLS0tLSUwQQ==\"}}],\"users\":[{\"name\":\"kubelet\",\"user\":{\"token\":\"AAAAB3NzaC1yc2EAAAADAQABAAACAQDaJEjsx1sOoRh+vT3UXIspVBlnqswPFXUv4DeOwA9iM/++CrIqRZQNge760WzBOLXMq6J6FHw/w5seim3oCpdFa54JmZsJMFBx8u56Hg9JZdjtKk36kpSvu53Moiit8/aTQyzKZZht+n+xxaby7b4XXM/MCNhvHERsbX36LLlK1BU+45037ePGmCwgjk+rHUjHHWHFhPG7mtXIiI/7CMt5mV03CkxflryU9iWNkYWl4vgy6NaYolfAgdlX4ryvEjBKx6HywllQsmK4AmoQyAErwKvurWrHn1zFellNBK5r2vvMTpPufdJN7yDERmFeOsucxZzvpESu5jVys1PFUJmyA8W0h3Xbq4IrxTGm0xhYmt2HNWQ8i840jD7ZKVq6RIpeiVOn60Ha0pVDBZfyWMOVZAeF3mV8g8gI9WkJDJHXkwhOZn5P3D7sv3ABuI3u3xzXQiLQgpAEuZzMB1NwDR8Rz9csRfxRHd1Nl6oYOGT583qPpBQsXrTI9kINpCAVDH7k+qS+IwCIq6soczUUYgXNWCafwdiqPSZOZCOnnTmJ9+SLFHAaa4sHlEhdekfPND4riKYIpZwlsU87aN2tGWZDcRPX/6di3opTx5B68izGKBWgKgF5XcpSH5e2dSqhnA1QjLMUDIZZ0hMIC1HjGTY6mkHXsS3FD79vKi+SX8jTLw==\"}}],\"contexts\":[{\"name\":\"kubelet\",\"context\":{\"cluster\":\"local\",\"user\":\"kubelet\"}}],\"current-context\":\"kubelet\"}",
2929
expectedErr: false,
3030
},
3131
{
@@ -36,7 +36,7 @@ func TestNewKubeConfigFromSecret(t *testing.T) {
3636
core.ServiceAccountTokenKey: []byte(""),
3737
},
3838
},
39-
expectedSpec: "{\"preferences\":{},\"clusters\":[{\"name\":\"local\",\"cluster\":{\"server\":\"\"}}],\"users\":[{\"name\":\"kubelet\",\"user\":{}}],\"contexts\":[{\"name\":\"kubelet\",\"context\":{\"cluster\":\"local\",\"user\":\"kubelet\"}}],\"current-context\":\"kubelet\"}",
39+
expectedSpec: "{\"clusters\":[{\"name\":\"local\",\"cluster\":{\"server\":\"\"}}],\"users\":[{\"name\":\"kubelet\",\"user\":{}}],\"contexts\":[{\"name\":\"kubelet\",\"context\":{\"cluster\":\"local\",\"user\":\"kubelet\"}}],\"current-context\":\"kubelet\"}",
4040
expectedErr: false,
4141
},
4242
{

0 commit comments

Comments
 (0)