Skip to content

Commit 86a8498

Browse files
authored
cmd/k8s-operator: use stable image for k8s-nameserver (tailscale#17985)
This commit modifies the kubernetes operator to use the "stable" version of `k8s-nameserver` by default. Updates: tailscale/corp#19028 Signed-off-by: David Bond <[email protected]>
1 parent a0d059d commit 86a8498

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

cmd/k8s-operator/nameserver.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2828
"sigs.k8s.io/yaml"
29+
2930
tsoperator "tailscale.com/k8s-operator"
3031
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
3132
"tailscale.com/kube/kubetypes"
@@ -45,10 +46,7 @@ const (
4546
messageMultipleDNSConfigsPresent = "Multiple DNSConfig resources found in cluster. Please ensure no more than one is present."
4647

4748
defaultNameserverImageRepo = "tailscale/k8s-nameserver"
48-
// TODO (irbekrm): once we start publishing nameserver images for stable
49-
// track, replace 'unstable' here with the version of this operator
50-
// instance.
51-
defaultNameserverImageTag = "unstable"
49+
defaultNameserverImageTag = "stable"
5250
)
5351

5452
// NameserverReconciler knows how to create nameserver resources in cluster in

cmd/k8s-operator/nameserver_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2121
"sigs.k8s.io/yaml"
22+
2223
operatorutils "tailscale.com/k8s-operator"
2324
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
2425
"tailscale.com/tstest"
@@ -182,7 +183,7 @@ func TestNameserverReconciler(t *testing.T) {
182183
dnsCfg.Spec.Nameserver.Image = nil
183184
})
184185
expectReconciled(t, reconciler, "", "test")
185-
wantsDeploy.Spec.Template.Spec.Containers[0].Image = "tailscale/k8s-nameserver:unstable"
186+
wantsDeploy.Spec.Template.Spec.Containers[0].Image = "tailscale/k8s-nameserver:stable"
186187
expectEqual(t, fc, wantsDeploy)
187188
})
188189
}

0 commit comments

Comments
 (0)