mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-01 00:33:43 +00:00
cmd/k8s-operator: fix unit tests
Change-Id: Id8a9e4725a8420c4cb7b52f050d6c371e42daad4 Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
parent
87da7b8667
commit
dc1a5cd004
@ -915,7 +915,7 @@ func TestProxyGroup(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupReady, metav1.ConditionTrue, reasonProxyGroupReady, reasonProxyGroupReady, 0, cl, zl.Sugar())
|
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupReady, metav1.ConditionTrue, reasonProxyGroupReady, reasonProxyGroupReady, 0, cl, zl.Sugar())
|
||||||
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupReady, "2/2 ProxyGroup pods running", 0, cl, zl.Sugar())
|
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupAvailable, "2/2 ProxyGroup pods running", 0, cl, zl.Sugar())
|
||||||
expectEqual(t, fc, pg)
|
expectEqual(t, fc, pg)
|
||||||
expectProxyGroupResources(t, fc, pg, true, pc)
|
expectProxyGroupResources(t, fc, pg, true, pc)
|
||||||
})
|
})
|
||||||
@ -934,7 +934,7 @@ func TestProxyGroup(t *testing.T) {
|
|||||||
addNodeIDToStateSecrets(t, fc, pg)
|
addNodeIDToStateSecrets(t, fc, pg)
|
||||||
expectReconciled(t, reconciler, "", pg.Name)
|
expectReconciled(t, reconciler, "", pg.Name)
|
||||||
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupReady, metav1.ConditionTrue, reasonProxyGroupReady, reasonProxyGroupReady, 0, cl, zl.Sugar())
|
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupReady, metav1.ConditionTrue, reasonProxyGroupReady, reasonProxyGroupReady, 0, cl, zl.Sugar())
|
||||||
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupReady, "3/3 ProxyGroup pods running", 0, cl, zl.Sugar())
|
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupAvailable, "3/3 ProxyGroup pods running", 0, cl, zl.Sugar())
|
||||||
pg.Status.Devices = append(pg.Status.Devices, tsapi.TailnetDevice{
|
pg.Status.Devices = append(pg.Status.Devices, tsapi.TailnetDevice{
|
||||||
Hostname: "hostname-nodeid-2",
|
Hostname: "hostname-nodeid-2",
|
||||||
TailnetIPs: []string{"1.2.3.4", "::1"},
|
TailnetIPs: []string{"1.2.3.4", "::1"},
|
||||||
@ -952,7 +952,7 @@ func TestProxyGroup(t *testing.T) {
|
|||||||
expectReconciled(t, reconciler, "", pg.Name)
|
expectReconciled(t, reconciler, "", pg.Name)
|
||||||
|
|
||||||
pg.Status.Devices = pg.Status.Devices[:1] // truncate to only the first device.
|
pg.Status.Devices = pg.Status.Devices[:1] // truncate to only the first device.
|
||||||
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupReady, "1/1 ProxyGroup pods running", 0, cl, zl.Sugar())
|
tsoperator.SetProxyGroupCondition(pg, tsapi.ProxyGroupAvailable, metav1.ConditionTrue, reasonProxyGroupAvailable, "1/1 ProxyGroup pods running", 0, cl, zl.Sugar())
|
||||||
expectEqual(t, fc, pg)
|
expectEqual(t, fc, pg)
|
||||||
expectProxyGroupResources(t, fc, pg, true, pc)
|
expectProxyGroupResources(t, fc, pg, true, pc)
|
||||||
})
|
})
|
||||||
@ -1208,6 +1208,9 @@ func TestProxyGroupTypes(t *testing.T) {
|
|||||||
Spec: tsapi.ProxyGroupSpec{
|
Spec: tsapi.ProxyGroupSpec{
|
||||||
Type: tsapi.ProxyGroupTypeKubernetesAPIServer,
|
Type: tsapi.ProxyGroupTypeKubernetesAPIServer,
|
||||||
Replicas: ptr.To[int32](2),
|
Replicas: ptr.To[int32](2),
|
||||||
|
KubeAPIServer: &tsapi.KubeAPIServerConfig{
|
||||||
|
Mode: ptr.To(tsapi.APIServerProxyModeNoAuth),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
if err := fc.Create(t.Context(), pg); err != nil {
|
if err := fc.Create(t.Context(), pg); err != nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user