diff --git a/cmd/k8s-operator/deploy/crds/tailscale.com_dnsconfigs.yaml b/cmd/k8s-operator/deploy/crds/tailscale.com_dnsconfigs.yaml index 2851a1221..b643c8715 100644 --- a/cmd/k8s-operator/deploy/crds/tailscale.com_dnsconfigs.yaml +++ b/cmd/k8s-operator/deploy/crds/tailscale.com_dnsconfigs.yaml @@ -977,6 +977,27 @@ spec: Empty topologyKey is not allowed. type: string x-kubernetes-list-type: atomic + imagePullSecrets: + description: |- + Nameserver Pod's image pull Secrets. + https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec + type: array + items: + description: |- + LocalObjectReference contains enough information to let you locate the + referenced object inside the same namespace. + type: object + properties: + name: + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + type: string + default: "" + x-kubernetes-map-type: atomic nodeSelector: description: If specified, applies node selector rules to the pods deployed by the DNSConfig resource. type: object diff --git a/cmd/k8s-operator/deploy/manifests/operator.yaml b/cmd/k8s-operator/deploy/manifests/operator.yaml index 4449eba4a..f3c763c6d 100644 --- a/cmd/k8s-operator/deploy/manifests/operator.yaml +++ b/cmd/k8s-operator/deploy/manifests/operator.yaml @@ -1315,6 +1315,27 @@ spec: x-kubernetes-list-type: atomic type: object type: object + imagePullSecrets: + description: |- + Nameserver Pod's image pull Secrets. + https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec + items: + description: |- + LocalObjectReference contains enough information to let you locate the + referenced object inside the same namespace. + properties: + name: + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + type: string + type: object + x-kubernetes-map-type: atomic + type: array nodeSelector: additionalProperties: type: string diff --git a/cmd/k8s-operator/nameserver.go b/cmd/k8s-operator/nameserver.go index f5565e5d3..d46d10d5e 100644 --- a/cmd/k8s-operator/nameserver.go +++ b/cmd/k8s-operator/nameserver.go @@ -192,6 +192,7 @@ func (a *NameserverReconciler) maybeProvision(ctx context.Context, tsDNSCfg *tsa dCfg.tolerations = tsDNSCfg.Spec.Nameserver.Pod.Tolerations dCfg.affinity = tsDNSCfg.Spec.Nameserver.Pod.Affinity dCfg.nodeSelector = tsDNSCfg.Spec.Nameserver.Pod.NodeSelector + dCfg.imagePullSecrets = tsDNSCfg.Spec.Nameserver.Pod.ImagePullSecrets } for _, deployable := range []deployable{saDeployable, deployDeployable, svcDeployable, cmDeployable} { @@ -226,9 +227,10 @@ type deployConfig struct { ownerRefs []metav1.OwnerReference namespace string clusterIP string - tolerations []corev1.Toleration - affinity *corev1.Affinity - nodeSelector map[string]string + tolerations []corev1.Toleration + affinity *corev1.Affinity + nodeSelector map[string]string + imagePullSecrets []corev1.LocalObjectReference } var ( @@ -256,6 +258,7 @@ var ( d.Spec.Template.Spec.Tolerations = cfg.tolerations d.Spec.Template.Spec.Affinity = cfg.affinity d.Spec.Template.Spec.NodeSelector = cfg.nodeSelector + d.Spec.Template.Spec.ImagePullSecrets = cfg.imagePullSecrets updateF := func(oldD *appsv1.Deployment) { oldD.Spec = d.Spec } diff --git a/cmd/k8s-operator/nameserver_test.go b/cmd/k8s-operator/nameserver_test.go index 3ec00d5ed..d7fa8dbb6 100644 --- a/cmd/k8s-operator/nameserver_test.go +++ b/cmd/k8s-operator/nameserver_test.go @@ -71,6 +71,9 @@ func TestNameserverReconciler(t *testing.T) { }, }, }, + ImagePullSecrets: []corev1.LocalObjectReference{ + {Name: "some-secret"}, + }, }, }, }, @@ -137,6 +140,9 @@ func TestNameserverReconciler(t *testing.T) { wantsDeploy.Spec.Template.Spec.NodeSelector = map[string]string{ "foo": "bar", } + wantsDeploy.Spec.Template.Spec.ImagePullSecrets = []corev1.LocalObjectReference{ + {Name: "some-secret"}, + } expectEqual(t, fc, wantsDeploy) }) diff --git a/k8s-operator/api.md b/k8s-operator/api.md index d4dc6f864..d77823037 100644 --- a/k8s-operator/api.md +++ b/k8s-operator/api.md @@ -488,6 +488,7 @@ _Appears in:_ | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.3/#toleration-v1-core) array_ | If specified, applies tolerations to the pods deployed by the DNSConfig resource. | | | | `affinity` _[Affinity](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.3/#affinity-v1-core)_ | If specified, applies affinity rules to the pods deployed by the DNSConfig resource. | | | | `nodeSelector` _object (keys:string, values:string)_ | If specified, applies node selector rules to the pods deployed by the DNSConfig resource. | | | +| `imagePullSecrets` _[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.3/#localobjectreference-v1-core) array_ | Nameserver Pod's image pull Secrets.
https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec | | | #### NameserverService diff --git a/k8s-operator/apis/v1alpha1/types_tsdnsconfig.go b/k8s-operator/apis/v1alpha1/types_tsdnsconfig.go index 529114c2e..53d38d3ca 100644 --- a/k8s-operator/apis/v1alpha1/types_tsdnsconfig.go +++ b/k8s-operator/apis/v1alpha1/types_tsdnsconfig.go @@ -119,6 +119,10 @@ type NameserverPod struct { // If specified, applies node selector rules to the pods deployed by the DNSConfig resource. // +optional NodeSelector map[string]string `json:"nodeSelector,omitzero"` + // Nameserver Pod's image pull Secrets. + // https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec + // +optional + ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"` } type DNSConfigStatus struct { diff --git a/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go b/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go index 4f4c1ee57..7d3052dbb 100644 --- a/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go +++ b/k8s-operator/apis/v1alpha1/zz_generated.deepcopy.go @@ -481,6 +481,11 @@ func (in *NameserverPod) DeepCopyInto(out *NameserverPod) { (*out)[key] = val } } + if in.ImagePullSecrets != nil { + in, out := &in.ImagePullSecrets, &out.ImagePullSecrets + *out = make([]corev1.LocalObjectReference, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NameserverPod.