mirror of
https://github.com/tailscale/tailscale.git
synced 2024-11-29 04:55:31 +00:00
cmd/k8s-operator,k8s-operator,go.{mod,sum}: publish proxy status condition for annotated services (#12463)
Adds a new TailscaleProxyReady condition type for use in corev1.Service conditions. Also switch our CRDs to use metav1.Condition instead of ConnectorCondition. The Go structs are seralized identically, but it updates some descriptions and validation rules. Update k8s controller-tools and controller-runtime deps to fix the documentation generation for metav1.Condition so that it excludes comments and TODOs. Stop expecting the fake client to populate TypeMeta in tests. See kubernetes-sigs/controller-runtime#2633 for details of the change. Finally, make some minor improvements to validation for service hostnames. Fixes #12216 Co-authored-by: Irbe Krumina <irbe@tailscale.com> Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
Tom Proctor
GitHub
parent
45d2f4301f
commit
3099323976
@ -33,11 +33,8 @@
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
reasonConnectorCreationFailed = "ConnectorCreationFailed"
|
reasonConnectorCreationFailed = "ConnectorCreationFailed"
|
||||||
|
reasonConnectorCreated = "ConnectorCreated"
|
||||||
reasonConnectorCreated = "ConnectorCreated"
|
reasonConnectorInvalid = "ConnectorInvalid"
|
||||||
reasonConnectorCleanupFailed = "ConnectorCleanupFailed"
|
|
||||||
reasonConnectorCleanupInProgress = "ConnectorCleanupInProgress"
|
|
||||||
reasonConnectorInvalid = "ConnectorInvalid"
|
|
||||||
|
|
||||||
messageConnectorCreationFailed = "Failed creating Connector: %v"
|
messageConnectorCreationFailed = "Failed creating Connector: %v"
|
||||||
messageConnectorInvalid = "Connector is invalid: %v"
|
messageConnectorInvalid = "Connector is invalid: %v"
|
||||||
@ -108,7 +105,7 @@ func (a *ConnectorReconciler) Reconcile(ctx context.Context, req reconcile.Reque
|
|||||||
}
|
}
|
||||||
|
|
||||||
oldCnStatus := cn.Status.DeepCopy()
|
oldCnStatus := cn.Status.DeepCopy()
|
||||||
setStatus := func(cn *tsapi.Connector, _ tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string) (reconcile.Result, error) {
|
setStatus := func(cn *tsapi.Connector, _ tsapi.ConditionType, status metav1.ConditionStatus, reason, message string) (reconcile.Result, error) {
|
||||||
tsoperator.SetConnectorCondition(cn, tsapi.ConnectorReady, status, reason, message, cn.Generation, a.clock, logger)
|
tsoperator.SetConnectorCondition(cn, tsapi.ConnectorReady, status, reason, message, cn.Generation, a.clock, logger)
|
||||||
if !apiequality.Semantic.DeepEqual(oldCnStatus, cn.Status) {
|
if !apiequality.Semantic.DeepEqual(oldCnStatus, cn.Status) {
|
||||||
// An error encountered here should get returned by the Reconcile function.
|
// An error encountered here should get returned by the Reconcile function.
|
||||||
|
|||||||
@ -272,9 +272,9 @@ func TestConnectorWithProxyClass(t *testing.T) {
|
|||||||
// its resources.
|
// its resources.
|
||||||
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
||||||
pc.Status = tsapi.ProxyClassStatus{
|
pc.Status = tsapi.ProxyClassStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{{
|
Conditions: []metav1.Condition{{
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Type: tsapi.ProxyClassready,
|
Type: string(tsapi.ProxyClassready),
|
||||||
ObservedGeneration: pc.Generation,
|
ObservedGeneration: pc.Generation,
|
||||||
}}}
|
}}}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
|
|||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.13.0
|
controller-gen.kubebuilder.io/version: v0.15.1-0.20240618033008-7824932b0cab
|
||||||
name: connectors.tailscale.com
|
name: connectors.tailscale.com
|
||||||
spec:
|
spec:
|
||||||
group: tailscale.com
|
group: tailscale.com
|
||||||
@ -31,48 +31,95 @@ spec:
|
|||||||
name: v1alpha1
|
name: v1alpha1
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
description: 'Connector defines a Tailscale node that will be deployed in the cluster. The node can be configured to act as a Tailscale subnet router and/or a Tailscale exit node. Connector is a cluster-scoped resource. More info: https://tailscale.com/kb/1236/kubernetes-operator#deploying-exit-nodes-and-subnet-routers-on-kubernetes-using-connector-custom-resource'
|
description: |-
|
||||||
|
Connector defines a Tailscale node that will be deployed in the cluster. The
|
||||||
|
node can be configured to act as a Tailscale subnet router and/or a Tailscale
|
||||||
|
exit node.
|
||||||
|
Connector is a cluster-scoped resource.
|
||||||
|
More info:
|
||||||
|
https://tailscale.com/kb/1236/kubernetes-operator#deploying-exit-nodes-and-subnet-routers-on-kubernetes-using-connector-custom-resource
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- spec
|
- spec
|
||||||
properties:
|
properties:
|
||||||
apiVersion:
|
apiVersion:
|
||||||
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
description: |-
|
||||||
|
APIVersion defines the versioned schema of this representation of an object.
|
||||||
|
Servers should convert recognized schemas to the latest internal value, and
|
||||||
|
may reject unrecognized values.
|
||||||
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
||||||
type: string
|
type: string
|
||||||
kind:
|
kind:
|
||||||
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
description: |-
|
||||||
|
Kind is a string value representing the REST resource this object represents.
|
||||||
|
Servers may infer this from the endpoint the client submits requests to.
|
||||||
|
Cannot be updated.
|
||||||
|
In CamelCase.
|
||||||
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||||
type: string
|
type: string
|
||||||
metadata:
|
metadata:
|
||||||
type: object
|
type: object
|
||||||
spec:
|
spec:
|
||||||
description: 'ConnectorSpec describes the desired Tailscale component. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
|
description: |-
|
||||||
|
ConnectorSpec describes the desired Tailscale component.
|
||||||
|
More info:
|
||||||
|
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
exitNode:
|
exitNode:
|
||||||
description: ExitNode defines whether the Connector node should act as a Tailscale exit node. Defaults to false. https://tailscale.com/kb/1103/exit-nodes
|
description: |-
|
||||||
|
ExitNode defines whether the Connector node should act as a
|
||||||
|
Tailscale exit node. Defaults to false.
|
||||||
|
https://tailscale.com/kb/1103/exit-nodes
|
||||||
type: boolean
|
type: boolean
|
||||||
hostname:
|
hostname:
|
||||||
description: Hostname is the tailnet hostname that should be assigned to the Connector node. If unset, hostname defaults to <connector name>-connector. Hostname can contain lower case letters, numbers and dashes, it must not start or end with a dash and must be between 2 and 63 characters long.
|
description: |-
|
||||||
|
Hostname is the tailnet hostname that should be assigned to the
|
||||||
|
Connector node. If unset, hostname defaults to <connector
|
||||||
|
name>-connector. Hostname can contain lower case letters, numbers and
|
||||||
|
dashes, it must not start or end with a dash and must be between 2
|
||||||
|
and 63 characters long.
|
||||||
type: string
|
type: string
|
||||||
pattern: ^[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$
|
pattern: ^[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$
|
||||||
proxyClass:
|
proxyClass:
|
||||||
description: ProxyClass is the name of the ProxyClass custom resource that contains configuration options that should be applied to the resources created for this Connector. If unset, the operator will create resources with the default configuration.
|
description: |-
|
||||||
|
ProxyClass is the name of the ProxyClass custom resource that
|
||||||
|
contains configuration options that should be applied to the
|
||||||
|
resources created for this Connector. If unset, the operator will
|
||||||
|
create resources with the default configuration.
|
||||||
type: string
|
type: string
|
||||||
subnetRouter:
|
subnetRouter:
|
||||||
description: SubnetRouter defines subnet routes that the Connector node should expose to tailnet. If unset, none are exposed. https://tailscale.com/kb/1019/subnets/
|
description: |-
|
||||||
|
SubnetRouter defines subnet routes that the Connector node should
|
||||||
|
expose to tailnet. If unset, none are exposed.
|
||||||
|
https://tailscale.com/kb/1019/subnets/
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- advertiseRoutes
|
- advertiseRoutes
|
||||||
properties:
|
properties:
|
||||||
advertiseRoutes:
|
advertiseRoutes:
|
||||||
description: AdvertiseRoutes refer to CIDRs that the subnet router should make available. Route values must be strings that represent a valid IPv4 or IPv6 CIDR range. Values can be Tailscale 4via6 subnet routes. https://tailscale.com/kb/1201/4via6-subnets/
|
description: |-
|
||||||
|
AdvertiseRoutes refer to CIDRs that the subnet router should make
|
||||||
|
available. Route values must be strings that represent a valid IPv4
|
||||||
|
or IPv6 CIDR range. Values can be Tailscale 4via6 subnet routes.
|
||||||
|
https://tailscale.com/kb/1201/4via6-subnets/
|
||||||
type: array
|
type: array
|
||||||
minItems: 1
|
minItems: 1
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
format: cidr
|
format: cidr
|
||||||
tags:
|
tags:
|
||||||
description: Tags that the Tailscale node will be tagged with. Defaults to [tag:k8s]. To autoapprove the subnet routes or exit node defined by a Connector, you can configure Tailscale ACLs to give these tags the necessary permissions. See https://tailscale.com/kb/1018/acls/#auto-approvers-for-routes-and-exit-nodes. If you specify custom tags here, you must also make the operator an owner of these tags. See https://tailscale.com/kb/1236/kubernetes-operator/#setting-up-the-kubernetes-operator. Tags cannot be changed once a Connector node has been created. Tag values must be in form ^tag:[a-zA-Z][a-zA-Z0-9-]*$.
|
description: |-
|
||||||
|
Tags that the Tailscale node will be tagged with.
|
||||||
|
Defaults to [tag:k8s].
|
||||||
|
To autoapprove the subnet routes or exit node defined by a Connector,
|
||||||
|
you can configure Tailscale ACLs to give these tags the necessary
|
||||||
|
permissions.
|
||||||
|
See https://tailscale.com/kb/1018/acls/#auto-approvers-for-routes-and-exit-nodes.
|
||||||
|
If you specify custom tags here, you must also make the operator an owner of these tags.
|
||||||
|
See https://tailscale.com/kb/1236/kubernetes-operator/#setting-up-the-kubernetes-operator.
|
||||||
|
Tags cannot be changed once a Connector node has been created.
|
||||||
|
Tag values must be in form ^tag:[a-zA-Z][a-zA-Z0-9-]*$.
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
@ -81,53 +128,90 @@ spec:
|
|||||||
- rule: has(self.subnetRouter) || self.exitNode == true
|
- rule: has(self.subnetRouter) || self.exitNode == true
|
||||||
message: A Connector needs to be either an exit node or a subnet router, or both.
|
message: A Connector needs to be either an exit node or a subnet router, or both.
|
||||||
status:
|
status:
|
||||||
description: ConnectorStatus describes the status of the Connector. This is set and managed by the Tailscale operator.
|
description: |-
|
||||||
|
ConnectorStatus describes the status of the Connector. This is set
|
||||||
|
and managed by the Tailscale operator.
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
conditions:
|
conditions:
|
||||||
description: List of status conditions to indicate the status of the Connector. Known condition types are `ConnectorReady`.
|
description: |-
|
||||||
|
List of status conditions to indicate the status of the Connector.
|
||||||
|
Known condition types are `ConnectorReady`.
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
description: ConnectorCondition contains condition information for a Connector.
|
description: Condition contains details for one aspect of the current state of this API Resource.
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
|
- lastTransitionTime
|
||||||
|
- message
|
||||||
|
- reason
|
||||||
- status
|
- status
|
||||||
- type
|
- type
|
||||||
properties:
|
properties:
|
||||||
lastTransitionTime:
|
lastTransitionTime:
|
||||||
description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
|
description: |-
|
||||||
|
lastTransitionTime is the last time the condition transitioned from one status to another.
|
||||||
|
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
|
||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
message:
|
message:
|
||||||
description: Message is a human readable description of the details of the last transition, complementing reason.
|
description: |-
|
||||||
|
message is a human readable message indicating details about the transition.
|
||||||
|
This may be an empty string.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 32768
|
||||||
observedGeneration:
|
observedGeneration:
|
||||||
description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Connector.
|
description: |-
|
||||||
|
observedGeneration represents the .metadata.generation that the condition was set based upon.
|
||||||
|
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
|
||||||
|
with respect to the current state of the instance.
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
|
minimum: 0
|
||||||
reason:
|
reason:
|
||||||
description: Reason is a brief machine readable explanation for the condition's last transition.
|
description: |-
|
||||||
|
reason contains a programmatic identifier indicating the reason for the condition's last transition.
|
||||||
|
Producers of specific condition types may define expected values and meanings for this field,
|
||||||
|
and whether the values are considered a guaranteed API.
|
||||||
|
The value should be a CamelCase string.
|
||||||
|
This field may not be empty.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 1024
|
||||||
|
minLength: 1
|
||||||
|
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
|
||||||
status:
|
status:
|
||||||
description: Status of the condition, one of ('True', 'False', 'Unknown').
|
description: status of the condition, one of True, False, Unknown.
|
||||||
type: string
|
type: string
|
||||||
|
enum:
|
||||||
|
- "True"
|
||||||
|
- "False"
|
||||||
|
- Unknown
|
||||||
type:
|
type:
|
||||||
description: Type of the condition, known values are (`SubnetRouterReady`).
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 316
|
||||||
|
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
|
||||||
x-kubernetes-list-map-keys:
|
x-kubernetes-list-map-keys:
|
||||||
- type
|
- type
|
||||||
x-kubernetes-list-type: map
|
x-kubernetes-list-type: map
|
||||||
hostname:
|
hostname:
|
||||||
description: Hostname is the fully qualified domain name of the Connector node. If MagicDNS is enabled in your tailnet, it is the MagicDNS name of the node.
|
description: |-
|
||||||
|
Hostname is the fully qualified domain name of the Connector node.
|
||||||
|
If MagicDNS is enabled in your tailnet, it is the MagicDNS name of the
|
||||||
|
node.
|
||||||
type: string
|
type: string
|
||||||
isExitNode:
|
isExitNode:
|
||||||
description: IsExitNode is set to true if the Connector acts as an exit node.
|
description: IsExitNode is set to true if the Connector acts as an exit node.
|
||||||
type: boolean
|
type: boolean
|
||||||
subnetRoutes:
|
subnetRoutes:
|
||||||
description: SubnetRoutes are the routes currently exposed to tailnet via this Connector instance.
|
description: |-
|
||||||
|
SubnetRoutes are the routes currently exposed to tailnet via this
|
||||||
|
Connector instance.
|
||||||
type: string
|
type: string
|
||||||
tailnetIPs:
|
tailnetIPs:
|
||||||
description: TailnetIPs is the set of tailnet IP addresses (both IPv4 and IPv6) assigned to the Connector node.
|
description: |-
|
||||||
|
TailnetIPs is the set of tailnet IP addresses (both IPv4 and IPv6)
|
||||||
|
assigned to the Connector node.
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
|
|||||||
@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
|
|||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.13.0
|
controller-gen.kubebuilder.io/version: v0.15.1-0.20240618033008-7824932b0cab
|
||||||
name: dnsconfigs.tailscale.com
|
name: dnsconfigs.tailscale.com
|
||||||
spec:
|
spec:
|
||||||
group: tailscale.com
|
group: tailscale.com
|
||||||
@ -23,27 +23,69 @@ spec:
|
|||||||
name: v1alpha1
|
name: v1alpha1
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
description: 'DNSConfig can be deployed to cluster to make a subset of Tailscale MagicDNS names resolvable by cluster workloads. Use this if: A) you need to refer to tailnet services, exposed to cluster via Tailscale Kubernetes operator egress proxies by the MagicDNS names of those tailnet services (usually because the services run over HTTPS) B) you have exposed a cluster workload to the tailnet using Tailscale Ingress and you also want to refer to the workload from within the cluster over the Ingress''s MagicDNS name (usually because you have some callback component that needs to use the same URL as that used by a non-cluster client on tailnet). When a DNSConfig is applied to a cluster, Tailscale Kubernetes operator will deploy a nameserver for ts.net DNS names and automatically populate it with records for any Tailscale egress or Ingress proxies deployed to that cluster. Currently you must manually update your cluster DNS configuration to add the IP address of the deployed nameserver as a ts.net stub nameserver. Instructions for how to do it: https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#configuration-of-stub-domain-and-upstream-nameserver-using-coredns (for CoreDNS), https://cloud.google.com/kubernetes-engine/docs/how-to/kube-dns (for kube-dns). Tailscale Kubernetes operator will write the address of a Service fronting the nameserver to dsnconfig.status.nameserver.ip. DNSConfig is a singleton - you must not create more than one. NB: if you want cluster workloads to be able to refer to Tailscale Ingress using its MagicDNS name, you must also annotate the Ingress resource with tailscale.com/experimental-forward-cluster-traffic-via-ingress annotation to ensure that the proxy created for the Ingress listens on its Pod IP address. NB: Clusters where Pods get assigned IPv6 addresses only are currently not supported.'
|
description: |-
|
||||||
|
DNSConfig can be deployed to cluster to make a subset of Tailscale MagicDNS
|
||||||
|
names resolvable by cluster workloads. Use this if: A) you need to refer to
|
||||||
|
tailnet services, exposed to cluster via Tailscale Kubernetes operator egress
|
||||||
|
proxies by the MagicDNS names of those tailnet services (usually because the
|
||||||
|
services run over HTTPS)
|
||||||
|
B) you have exposed a cluster workload to the tailnet using Tailscale Ingress
|
||||||
|
and you also want to refer to the workload from within the cluster over the
|
||||||
|
Ingress's MagicDNS name (usually because you have some callback component
|
||||||
|
that needs to use the same URL as that used by a non-cluster client on
|
||||||
|
tailnet).
|
||||||
|
When a DNSConfig is applied to a cluster, Tailscale Kubernetes operator will
|
||||||
|
deploy a nameserver for ts.net DNS names and automatically populate it with records
|
||||||
|
for any Tailscale egress or Ingress proxies deployed to that cluster.
|
||||||
|
Currently you must manually update your cluster DNS configuration to add the
|
||||||
|
IP address of the deployed nameserver as a ts.net stub nameserver.
|
||||||
|
Instructions for how to do it:
|
||||||
|
https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#configuration-of-stub-domain-and-upstream-nameserver-using-coredns (for CoreDNS),
|
||||||
|
https://cloud.google.com/kubernetes-engine/docs/how-to/kube-dns (for kube-dns).
|
||||||
|
Tailscale Kubernetes operator will write the address of a Service fronting
|
||||||
|
the nameserver to dsnconfig.status.nameserver.ip.
|
||||||
|
DNSConfig is a singleton - you must not create more than one.
|
||||||
|
NB: if you want cluster workloads to be able to refer to Tailscale Ingress
|
||||||
|
using its MagicDNS name, you must also annotate the Ingress resource with
|
||||||
|
tailscale.com/experimental-forward-cluster-traffic-via-ingress annotation to
|
||||||
|
ensure that the proxy created for the Ingress listens on its Pod IP address.
|
||||||
|
NB: Clusters where Pods get assigned IPv6 addresses only are currently not supported.
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- spec
|
- spec
|
||||||
properties:
|
properties:
|
||||||
apiVersion:
|
apiVersion:
|
||||||
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
description: |-
|
||||||
|
APIVersion defines the versioned schema of this representation of an object.
|
||||||
|
Servers should convert recognized schemas to the latest internal value, and
|
||||||
|
may reject unrecognized values.
|
||||||
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
||||||
type: string
|
type: string
|
||||||
kind:
|
kind:
|
||||||
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
description: |-
|
||||||
|
Kind is a string value representing the REST resource this object represents.
|
||||||
|
Servers may infer this from the endpoint the client submits requests to.
|
||||||
|
Cannot be updated.
|
||||||
|
In CamelCase.
|
||||||
|
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||||
type: string
|
type: string
|
||||||
metadata:
|
metadata:
|
||||||
type: object
|
type: object
|
||||||
spec:
|
spec:
|
||||||
description: 'Spec describes the desired DNS configuration. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
|
description: |-
|
||||||
|
Spec describes the desired DNS configuration.
|
||||||
|
More info:
|
||||||
|
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- nameserver
|
- nameserver
|
||||||
properties:
|
properties:
|
||||||
nameserver:
|
nameserver:
|
||||||
description: Configuration for a nameserver that can resolve ts.net DNS names associated with in-cluster proxies for Tailscale egress Services and Tailscale Ingresses. The operator will always deploy this nameserver when a DNSConfig is applied.
|
description: |-
|
||||||
|
Configuration for a nameserver that can resolve ts.net DNS names
|
||||||
|
associated with in-cluster proxies for Tailscale egress Services and
|
||||||
|
Tailscale Ingresses. The operator will always deploy this nameserver
|
||||||
|
when a DNSConfig is applied.
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
image:
|
image:
|
||||||
@ -57,38 +99,66 @@ spec:
|
|||||||
description: Tag defaults to operator's own tag.
|
description: Tag defaults to operator's own tag.
|
||||||
type: string
|
type: string
|
||||||
status:
|
status:
|
||||||
description: Status describes the status of the DNSConfig. This is set and managed by the Tailscale operator.
|
description: |-
|
||||||
|
Status describes the status of the DNSConfig. This is set
|
||||||
|
and managed by the Tailscale operator.
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
conditions:
|
conditions:
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
description: ConnectorCondition contains condition information for a Connector.
|
description: Condition contains details for one aspect of the current state of this API Resource.
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
|
- lastTransitionTime
|
||||||
|
- message
|
||||||
|
- reason
|
||||||
- status
|
- status
|
||||||
- type
|
- type
|
||||||
properties:
|
properties:
|
||||||
lastTransitionTime:
|
lastTransitionTime:
|
||||||
description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
|
description: |-
|
||||||
|
lastTransitionTime is the last time the condition transitioned from one status to another.
|
||||||
|
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
|
||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
message:
|
message:
|
||||||
description: Message is a human readable description of the details of the last transition, complementing reason.
|
description: |-
|
||||||
|
message is a human readable message indicating details about the transition.
|
||||||
|
This may be an empty string.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 32768
|
||||||
observedGeneration:
|
observedGeneration:
|
||||||
description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Connector.
|
description: |-
|
||||||
|
observedGeneration represents the .metadata.generation that the condition was set based upon.
|
||||||
|
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
|
||||||
|
with respect to the current state of the instance.
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
|
minimum: 0
|
||||||
reason:
|
reason:
|
||||||
description: Reason is a brief machine readable explanation for the condition's last transition.
|
description: |-
|
||||||
|
reason contains a programmatic identifier indicating the reason for the condition's last transition.
|
||||||
|
Producers of specific condition types may define expected values and meanings for this field,
|
||||||
|
and whether the values are considered a guaranteed API.
|
||||||
|
The value should be a CamelCase string.
|
||||||
|
This field may not be empty.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 1024
|
||||||
|
minLength: 1
|
||||||
|
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
|
||||||
status:
|
status:
|
||||||
description: Status of the condition, one of ('True', 'False', 'Unknown').
|
description: status of the condition, one of True, False, Unknown.
|
||||||
type: string
|
type: string
|
||||||
|
enum:
|
||||||
|
- "True"
|
||||||
|
- "False"
|
||||||
|
- Unknown
|
||||||
type:
|
type:
|
||||||
description: Type of the condition, known values are (`SubnetRouterReady`).
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
||||||
type: string
|
type: string
|
||||||
|
maxLength: 316
|
||||||
|
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
|
||||||
x-kubernetes-list-map-keys:
|
x-kubernetes-list-map-keys:
|
||||||
- type
|
- type
|
||||||
x-kubernetes-list-type: map
|
x-kubernetes-list-type: map
|
||||||
@ -97,7 +167,13 @@ spec:
|
|||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
ip:
|
ip:
|
||||||
description: IP is the ClusterIP of the Service fronting the deployed ts.net nameserver. Currently you must manually update your cluster DNS config to add this address as a stub nameserver for ts.net for cluster workloads to be able to resolve MagicDNS names associated with egress or Ingress proxies. The IP address will change if you delete and recreate the DNSConfig.
|
description: |-
|
||||||
|
IP is the ClusterIP of the Service fronting the deployed ts.net nameserver.
|
||||||
|
Currently you must manually update your cluster DNS config to add
|
||||||
|
this address as a stub nameserver for ts.net for cluster workloads to be
|
||||||
|
able to resolve MagicDNS names associated with egress or Ingress
|
||||||
|
proxies.
|
||||||
|
The IP address will change if you delete and recreate the DNSConfig.
|
||||||
type: string
|
type: string
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -248,9 +248,9 @@ func TestTailscaleIngressWithProxyClass(t *testing.T) {
|
|||||||
// created proxy resources.
|
// created proxy resources.
|
||||||
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
||||||
pc.Status = tsapi.ProxyClassStatus{
|
pc.Status = tsapi.ProxyClassStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{{
|
Conditions: []metav1.Condition{{
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Type: tsapi.ProxyClassready,
|
Type: string(tsapi.ProxyClassready),
|
||||||
ObservedGeneration: pc.Generation,
|
ObservedGeneration: pc.Generation,
|
||||||
}}}
|
}}}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -101,7 +101,7 @@ func (a *NameserverReconciler) Reconcile(ctx context.Context, req reconcile.Requ
|
|||||||
}
|
}
|
||||||
|
|
||||||
oldCnStatus := dnsCfg.Status.DeepCopy()
|
oldCnStatus := dnsCfg.Status.DeepCopy()
|
||||||
setStatus := func(dnsCfg *tsapi.DNSConfig, conditionType tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string) (reconcile.Result, error) {
|
setStatus := func(dnsCfg *tsapi.DNSConfig, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string) (reconcile.Result, error) {
|
||||||
tsoperator.SetDNSConfigCondition(dnsCfg, tsapi.NameserverReady, status, reason, message, dnsCfg.Generation, a.clock, logger)
|
tsoperator.SetDNSConfigCondition(dnsCfg, tsapi.NameserverReady, status, reason, message, dnsCfg.Generation, a.clock, logger)
|
||||||
if !apiequality.Semantic.DeepEqual(oldCnStatus, dnsCfg.Status) {
|
if !apiequality.Semantic.DeepEqual(oldCnStatus, dnsCfg.Status) {
|
||||||
// An error encountered here should get returned by the Reconcile function.
|
// An error encountered here should get returned by the Reconcile function.
|
||||||
|
|||||||
@ -81,12 +81,12 @@ func TestNameserverReconciler(t *testing.T) {
|
|||||||
IP: "1.2.3.4",
|
IP: "1.2.3.4",
|
||||||
}
|
}
|
||||||
dnsCfg.Finalizers = []string{FinalizerName}
|
dnsCfg.Finalizers = []string{FinalizerName}
|
||||||
dnsCfg.Status.Conditions = append(dnsCfg.Status.Conditions, tsapi.ConnectorCondition{
|
dnsCfg.Status.Conditions = append(dnsCfg.Status.Conditions, metav1.Condition{
|
||||||
Type: tsapi.NameserverReady,
|
Type: string(tsapi.NameserverReady),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: reasonNameserverCreated,
|
Reason: reasonNameserverCreated,
|
||||||
Message: reasonNameserverCreated,
|
Message: reasonNameserverCreated,
|
||||||
LastTransitionTime: &metav1.Time{Time: cl.Now().Truncate(time.Second)},
|
LastTransitionTime: metav1.Time{Time: cl.Now().Truncate(time.Second)},
|
||||||
})
|
})
|
||||||
expectEqual(t, fc, dnsCfg, nil)
|
expectEqual(t, fc, dnsCfg, nil)
|
||||||
|
|
||||||
|
|||||||
@ -278,6 +278,7 @@ func runReconcilers(opts reconcilerOpts) {
|
|||||||
isDefaultLoadBalancer: opts.proxyActAsDefaultLoadBalancer,
|
isDefaultLoadBalancer: opts.proxyActAsDefaultLoadBalancer,
|
||||||
recorder: eventRecorder,
|
recorder: eventRecorder,
|
||||||
tsNamespace: opts.tailscaleNamespace,
|
tsNamespace: opts.tailscaleNamespace,
|
||||||
|
clock: tstime.DefaultClock{},
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
startlog.Fatalf("could not create service reconciler: %v", err)
|
startlog.Fatalf("could not create service reconciler: %v", err)
|
||||||
|
|||||||
@ -9,6 +9,7 @@
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
"github.com/google/go-cmp/cmp"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
@ -17,10 +18,13 @@
|
|||||||
networkingv1 "k8s.io/api/networking/v1"
|
networkingv1 "k8s.io/api/networking/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
|
"k8s.io/client-go/tools/record"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||||
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
||||||
"tailscale.com/net/dns/resolvconffile"
|
"tailscale.com/net/dns/resolvconffile"
|
||||||
|
"tailscale.com/tstest"
|
||||||
|
"tailscale.com/tstime"
|
||||||
"tailscale.com/types/ptr"
|
"tailscale.com/types/ptr"
|
||||||
"tailscale.com/util/dnsname"
|
"tailscale.com/util/dnsname"
|
||||||
"tailscale.com/util/mak"
|
"tailscale.com/util/mak"
|
||||||
@ -33,6 +37,7 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -42,11 +47,13 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
operatorNamespace: "operator-ns",
|
operatorNamespace: "operator-ns",
|
||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
|
recorder: record.NewFakeRecorder(100),
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, but start with a miconfiguration
|
||||||
// of objects looks right.
|
// in the annotations.
|
||||||
mustCreate(t, fc, &corev1.Service{
|
mustCreate(t, fc, &corev1.Service{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
@ -55,6 +62,9 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
// doesn't. So, set it explicitly because other code later depends
|
// doesn't. So, set it explicitly because other code later depends
|
||||||
// on it being set.
|
// on it being set.
|
||||||
UID: types.UID("1234-UID"),
|
UID: types.UID("1234-UID"),
|
||||||
|
Annotations: map[string]string{
|
||||||
|
AnnotationTailnetTargetFQDN: "invalid.example.com",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Spec: corev1.ServiceSpec{
|
Spec: corev1.ServiceSpec{
|
||||||
ClusterIP: "10.20.30.40",
|
ClusterIP: "10.20.30.40",
|
||||||
@ -65,6 +75,46 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
|
|
||||||
expectReconciled(t, sr, "default", "test")
|
expectReconciled(t, sr, "default", "test")
|
||||||
|
|
||||||
|
// The expected value of .status.conditions[0].LastTransitionTime until the
|
||||||
|
// proxy becomes ready.
|
||||||
|
t0 := conditionTime(clock)
|
||||||
|
|
||||||
|
// Should have an error about invalid config.
|
||||||
|
want := &corev1.Service{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: "test",
|
||||||
|
Namespace: "default",
|
||||||
|
UID: types.UID("1234-UID"),
|
||||||
|
Annotations: map[string]string{
|
||||||
|
AnnotationTailnetTargetFQDN: "invalid.example.com",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Spec: corev1.ServiceSpec{
|
||||||
|
ClusterIP: "10.20.30.40",
|
||||||
|
Type: corev1.ServiceTypeLoadBalancer,
|
||||||
|
LoadBalancerClass: ptr.To("tailscale"),
|
||||||
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: []metav1.Condition{{
|
||||||
|
Type: string(tsapi.ProxyReady),
|
||||||
|
Status: metav1.ConditionFalse,
|
||||||
|
LastTransitionTime: t0,
|
||||||
|
Reason: reasonProxyInvalid,
|
||||||
|
Message: `unable to provision proxy resources: invalid Service: invalid value of annotation tailscale.com/tailnet-fqdn: "invalid.example.com" does not appear to be a valid MagicDNS name`,
|
||||||
|
}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
expectEqual(t, fc, want, nil)
|
||||||
|
|
||||||
|
// Delete the misconfiguration so the proxy starts getting created on the
|
||||||
|
// next reconcile.
|
||||||
|
mustUpdate(t, fc, "default", "test", func(s *corev1.Service) {
|
||||||
|
s.ObjectMeta.Annotations = nil
|
||||||
|
})
|
||||||
|
|
||||||
|
clock.Advance(time.Second)
|
||||||
|
expectReconciled(t, sr, "default", "test")
|
||||||
|
|
||||||
fullName, shortName := findGenName(t, fc, "default", "test", "svc")
|
fullName, shortName := findGenName(t, fc, "default", "test", "svc")
|
||||||
opts := configOpts{
|
opts := configOpts{
|
||||||
stsName: shortName,
|
stsName: shortName,
|
||||||
@ -79,6 +129,19 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
||||||
expectEqual(t, fc, expectedSTS(t, fc, opts), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, opts), removeHashAnnotation)
|
||||||
|
|
||||||
|
want.Annotations = nil
|
||||||
|
want.ObjectMeta.Finalizers = []string{"tailscale.com/finalizer"}
|
||||||
|
want.Status = corev1.ServiceStatus{
|
||||||
|
Conditions: []metav1.Condition{{
|
||||||
|
Type: string(tsapi.ProxyReady),
|
||||||
|
Status: metav1.ConditionFalse,
|
||||||
|
LastTransitionTime: t0, // Status is still false, no update to transition time
|
||||||
|
Reason: reasonProxyPending,
|
||||||
|
Message: "no Tailscale hostname known yet, waiting for proxy pod to finish auth",
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
expectEqual(t, fc, want, nil)
|
||||||
|
|
||||||
// Normally the Tailscale proxy pod would come up here and write its info
|
// Normally the Tailscale proxy pod would come up here and write its info
|
||||||
// into the secret. Simulate that, then verify reconcile again and verify
|
// into the secret. Simulate that, then verify reconcile again and verify
|
||||||
// that we get to the end.
|
// that we get to the end.
|
||||||
@ -90,33 +153,16 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
s.Data["device_fqdn"] = []byte("tailscale.device.name.")
|
s.Data["device_fqdn"] = []byte("tailscale.device.name.")
|
||||||
s.Data["device_ips"] = []byte(`["100.99.98.97", "2c0a:8083:94d4:2012:3165:34a5:3616:5fdf"]`)
|
s.Data["device_ips"] = []byte(`["100.99.98.97", "2c0a:8083:94d4:2012:3165:34a5:3616:5fdf"]`)
|
||||||
})
|
})
|
||||||
|
clock.Advance(time.Second)
|
||||||
expectReconciled(t, sr, "default", "test")
|
expectReconciled(t, sr, "default", "test")
|
||||||
want := &corev1.Service{
|
want.Status.Conditions = proxyCreatedCondition(clock)
|
||||||
TypeMeta: metav1.TypeMeta{
|
want.Status.LoadBalancer = corev1.LoadBalancerStatus{
|
||||||
Kind: "Service",
|
Ingress: []corev1.LoadBalancerIngress{
|
||||||
APIVersion: "v1",
|
{
|
||||||
},
|
Hostname: "tailscale.device.name",
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
},
|
||||||
Name: "test",
|
{
|
||||||
Namespace: "default",
|
IP: "100.99.98.97",
|
||||||
Finalizers: []string{"tailscale.com/finalizer"},
|
|
||||||
UID: types.UID("1234-UID"),
|
|
||||||
},
|
|
||||||
Spec: corev1.ServiceSpec{
|
|
||||||
ClusterIP: "10.20.30.40",
|
|
||||||
Type: corev1.ServiceTypeLoadBalancer,
|
|
||||||
LoadBalancerClass: ptr.To("tailscale"),
|
|
||||||
},
|
|
||||||
Status: corev1.ServiceStatus{
|
|
||||||
LoadBalancer: corev1.LoadBalancerStatus{
|
|
||||||
Ingress: []corev1.LoadBalancerIngress{
|
|
||||||
{
|
|
||||||
Hostname: "tailscale.device.name",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
IP: "100.99.98.97",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -144,11 +190,9 @@ func TestLoadBalancerClass(t *testing.T) {
|
|||||||
expectMissing[appsv1.StatefulSet](t, fc, "operator-ns", shortName)
|
expectMissing[appsv1.StatefulSet](t, fc, "operator-ns", shortName)
|
||||||
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
||||||
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
||||||
|
|
||||||
|
// Note that the Tailscale-specific condition status should be gone now.
|
||||||
want = &corev1.Service{
|
want = &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -170,6 +214,7 @@ func TestTailnetTargetFQDNAnnotation(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
tailnetTargetFQDN := "foo.bar.ts.net."
|
tailnetTargetFQDN := "foo.bar.ts.net."
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -180,6 +225,7 @@ func TestTailnetTargetFQDNAnnotation(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -220,10 +266,6 @@ func TestTailnetTargetFQDNAnnotation(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
||||||
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -238,6 +280,9 @@ func TestTailnetTargetFQDNAnnotation(t *testing.T) {
|
|||||||
Type: corev1.ServiceTypeExternalName,
|
Type: corev1.ServiceTypeExternalName,
|
||||||
Selector: nil,
|
Selector: nil,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
expectEqual(t, fc, expectedSecret(t, fc, o), nil)
|
expectEqual(t, fc, expectedSecret(t, fc, o), nil)
|
||||||
@ -280,6 +325,7 @@ func TestTailnetTargetIPAnnotation(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
tailnetTargetIP := "100.66.66.66"
|
tailnetTargetIP := "100.66.66.66"
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -290,6 +336,7 @@ func TestTailnetTargetIPAnnotation(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -330,10 +377,6 @@ func TestTailnetTargetIPAnnotation(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
||||||
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -348,6 +391,9 @@ func TestTailnetTargetIPAnnotation(t *testing.T) {
|
|||||||
Type: corev1.ServiceTypeExternalName,
|
Type: corev1.ServiceTypeExternalName,
|
||||||
Selector: nil,
|
Selector: nil,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
expectEqual(t, fc, expectedSecret(t, fc, o), nil)
|
expectEqual(t, fc, expectedSecret(t, fc, o), nil)
|
||||||
@ -389,6 +435,7 @@ func TestAnnotations(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -399,6 +446,7 @@ func TestAnnotations(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -437,10 +485,6 @@ func TestAnnotations(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
||||||
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -454,6 +498,9 @@ func TestAnnotations(t *testing.T) {
|
|||||||
ClusterIP: "10.20.30.40",
|
ClusterIP: "10.20.30.40",
|
||||||
Type: corev1.ServiceTypeClusterIP,
|
Type: corev1.ServiceTypeClusterIP,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
|
|
||||||
@ -473,10 +520,6 @@ func TestAnnotations(t *testing.T) {
|
|||||||
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
||||||
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
||||||
want = &corev1.Service{
|
want = &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -497,6 +540,7 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -507,6 +551,7 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -558,10 +603,6 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
})
|
})
|
||||||
expectReconciled(t, sr, "default", "test")
|
expectReconciled(t, sr, "default", "test")
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -575,6 +616,9 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
ClusterIP: "10.20.30.40",
|
ClusterIP: "10.20.30.40",
|
||||||
Type: corev1.ServiceTypeClusterIP,
|
Type: corev1.ServiceTypeClusterIP,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
|
|
||||||
@ -592,10 +636,6 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
// ... but the service should have a LoadBalancer status.
|
// ... but the service should have a LoadBalancer status.
|
||||||
|
|
||||||
want = &corev1.Service{
|
want = &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -618,6 +658,7 @@ func TestAnnotationIntoLB(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
@ -630,6 +671,7 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -640,6 +682,7 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -689,10 +732,6 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
})
|
})
|
||||||
expectReconciled(t, sr, "default", "test")
|
expectReconciled(t, sr, "default", "test")
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -715,6 +754,7 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
@ -740,10 +780,6 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
||||||
|
|
||||||
want = &corev1.Service{
|
want = &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -757,6 +793,9 @@ func TestLBIntoAnnotation(t *testing.T) {
|
|||||||
ClusterIP: "10.20.30.40",
|
ClusterIP: "10.20.30.40",
|
||||||
Type: corev1.ServiceTypeClusterIP,
|
Type: corev1.ServiceTypeClusterIP,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
}
|
}
|
||||||
@ -768,6 +807,7 @@ func TestCustomHostname(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -778,6 +818,7 @@ func TestCustomHostname(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -817,10 +858,6 @@ func TestCustomHostname(t *testing.T) {
|
|||||||
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
expectEqual(t, fc, expectedHeadlessService(shortName, "svc"), nil)
|
||||||
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
expectEqual(t, fc, expectedSTS(t, fc, o), removeHashAnnotation)
|
||||||
want := &corev1.Service{
|
want := &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -835,6 +872,9 @@ func TestCustomHostname(t *testing.T) {
|
|||||||
ClusterIP: "10.20.30.40",
|
ClusterIP: "10.20.30.40",
|
||||||
Type: corev1.ServiceTypeClusterIP,
|
Type: corev1.ServiceTypeClusterIP,
|
||||||
},
|
},
|
||||||
|
Status: corev1.ServiceStatus{
|
||||||
|
Conditions: proxyCreatedCondition(clock),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
expectEqual(t, fc, want, nil)
|
expectEqual(t, fc, want, nil)
|
||||||
|
|
||||||
@ -854,10 +894,6 @@ func TestCustomHostname(t *testing.T) {
|
|||||||
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
expectMissing[corev1.Service](t, fc, "operator-ns", shortName)
|
||||||
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
expectMissing[corev1.Secret](t, fc, "operator-ns", fullName)
|
||||||
want = &corev1.Service{
|
want = &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Namespace: "default",
|
Namespace: "default",
|
||||||
@ -881,6 +917,7 @@ func TestCustomPriorityClassName(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -892,6 +929,7 @@ func TestCustomPriorityClassName(t *testing.T) {
|
|||||||
proxyPriorityClassName: "custom-priority-class-name",
|
proxyPriorityClassName: "custom-priority-class-name",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a service that we should manage, and check that the initial round
|
// Create a service that we should manage, and check that the initial round
|
||||||
@ -954,6 +992,7 @@ func TestProxyClassForService(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -964,6 +1003,7 @@ func TestProxyClassForService(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. A new tailscale LoadBalancer Service is created without any
|
// 1. A new tailscale LoadBalancer Service is created without any
|
||||||
@ -1012,9 +1052,9 @@ func TestProxyClassForService(t *testing.T) {
|
|||||||
// applied to the proxy resources.
|
// applied to the proxy resources.
|
||||||
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
mustUpdateStatus(t, fc, "", "custom-metadata", func(pc *tsapi.ProxyClass) {
|
||||||
pc.Status = tsapi.ProxyClassStatus{
|
pc.Status = tsapi.ProxyClassStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{{
|
Conditions: []metav1.Condition{{
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Type: tsapi.ProxyClassready,
|
Type: string(tsapi.ProxyClassready),
|
||||||
ObservedGeneration: pc.Generation,
|
ObservedGeneration: pc.Generation,
|
||||||
}}}
|
}}}
|
||||||
})
|
})
|
||||||
@ -1041,6 +1081,7 @@ func TestDefaultLoadBalancer(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -1051,6 +1092,7 @@ func TestDefaultLoadBalancer(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
isDefaultLoadBalancer: true,
|
isDefaultLoadBalancer: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1095,6 +1137,7 @@ func TestProxyFirewallMode(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -1106,6 +1149,7 @@ func TestProxyFirewallMode(t *testing.T) {
|
|||||||
tsFirewallMode: "nftables",
|
tsFirewallMode: "nftables",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
isDefaultLoadBalancer: true,
|
isDefaultLoadBalancer: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1148,6 +1192,7 @@ func TestTailscaledConfigfileHash(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -1158,6 +1203,7 @@ func TestTailscaledConfigfileHash(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
isDefaultLoadBalancer: true,
|
isDefaultLoadBalancer: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1439,6 +1485,7 @@ func Test_externalNameService(t *testing.T) {
|
|||||||
|
|
||||||
// 1. A External name Service that should be exposed via Tailscale gets
|
// 1. A External name Service that should be exposed via Tailscale gets
|
||||||
// created.
|
// created.
|
||||||
|
clock := tstest.NewClock(tstest.ClockOpts{})
|
||||||
sr := &ServiceReconciler{
|
sr := &ServiceReconciler{
|
||||||
Client: fc,
|
Client: fc,
|
||||||
ssr: &tailscaleSTSReconciler{
|
ssr: &tailscaleSTSReconciler{
|
||||||
@ -1449,6 +1496,7 @@ func Test_externalNameService(t *testing.T) {
|
|||||||
proxyImage: "tailscale/tailscale",
|
proxyImage: "tailscale/tailscale",
|
||||||
},
|
},
|
||||||
logger: zl.Sugar(),
|
logger: zl.Sugar(),
|
||||||
|
clock: clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Create an ExternalName Service that we should manage, and check that the initial round
|
// 1. Create an ExternalName Service that we should manage, and check that the initial round
|
||||||
@ -1504,3 +1552,18 @@ func toFQDN(t *testing.T, s string) dnsname.FQDN {
|
|||||||
}
|
}
|
||||||
return fqdn
|
return fqdn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func proxyCreatedCondition(clock tstime.Clock) []metav1.Condition {
|
||||||
|
return []metav1.Condition{{
|
||||||
|
Type: string(tsapi.ProxyReady),
|
||||||
|
Status: metav1.ConditionTrue,
|
||||||
|
ObservedGeneration: 0,
|
||||||
|
LastTransitionTime: conditionTime(clock),
|
||||||
|
Reason: reasonProxyCreated,
|
||||||
|
Message: reasonProxyCreated,
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func conditionTime(clock tstime.Clock) metav1.Time {
|
||||||
|
return metav1.NewTime(clock.Now().Truncate(time.Second))
|
||||||
|
}
|
||||||
|
|||||||
@ -67,12 +67,12 @@ func TestProxyClass(t *testing.T) {
|
|||||||
|
|
||||||
// 1. A valid ProxyClass resource gets its status updated to Ready.
|
// 1. A valid ProxyClass resource gets its status updated to Ready.
|
||||||
expectReconciled(t, pcr, "", "test")
|
expectReconciled(t, pcr, "", "test")
|
||||||
pc.Status.Conditions = append(pc.Status.Conditions, tsapi.ConnectorCondition{
|
pc.Status.Conditions = append(pc.Status.Conditions, metav1.Condition{
|
||||||
Type: tsapi.ProxyClassready,
|
Type: string(tsapi.ProxyClassready),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: reasonProxyClassValid,
|
Reason: reasonProxyClassValid,
|
||||||
Message: reasonProxyClassValid,
|
Message: reasonProxyClassValid,
|
||||||
LastTransitionTime: &metav1.Time{Time: cl.Now().Truncate(time.Second)},
|
LastTransitionTime: metav1.Time{Time: cl.Now().Truncate(time.Second)},
|
||||||
})
|
})
|
||||||
|
|
||||||
expectEqual(t, fc, pc, nil)
|
expectEqual(t, fc, pc, nil)
|
||||||
|
|||||||
@ -35,7 +35,6 @@
|
|||||||
"tailscale.com/tailcfg"
|
"tailscale.com/tailcfg"
|
||||||
"tailscale.com/types/opt"
|
"tailscale.com/types/opt"
|
||||||
"tailscale.com/types/ptr"
|
"tailscale.com/types/ptr"
|
||||||
"tailscale.com/util/dnsname"
|
|
||||||
"tailscale.com/util/mak"
|
"tailscale.com/util/mak"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -947,14 +946,11 @@ func defaultEnv(envName, defVal string) string {
|
|||||||
return v
|
return v
|
||||||
}
|
}
|
||||||
|
|
||||||
func nameForService(svc *corev1.Service) (string, error) {
|
func nameForService(svc *corev1.Service) string {
|
||||||
if h, ok := svc.Annotations[AnnotationHostname]; ok {
|
if h, ok := svc.Annotations[AnnotationHostname]; ok {
|
||||||
if err := dnsname.ValidLabel(h); err != nil {
|
return h
|
||||||
return "", fmt.Errorf("invalid Tailscale hostname %q: %w", h, err)
|
|
||||||
}
|
|
||||||
return h, nil
|
|
||||||
}
|
}
|
||||||
return svc.Namespace + "-" + svc.Name, nil
|
return svc.Namespace + "-" + svc.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func isValidFirewallMode(m string) bool {
|
func isValidFirewallMode(m string) bool {
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/netip"
|
"net/netip"
|
||||||
"slices"
|
"slices"
|
||||||
@ -15,7 +16,9 @@
|
|||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
corev1 "k8s.io/api/core/v1"
|
corev1 "k8s.io/api/core/v1"
|
||||||
|
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
||||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
@ -23,13 +26,20 @@
|
|||||||
tsoperator "tailscale.com/k8s-operator"
|
tsoperator "tailscale.com/k8s-operator"
|
||||||
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
||||||
"tailscale.com/net/dns/resolvconffile"
|
"tailscale.com/net/dns/resolvconffile"
|
||||||
|
"tailscale.com/tstime"
|
||||||
"tailscale.com/util/clientmetric"
|
"tailscale.com/util/clientmetric"
|
||||||
|
"tailscale.com/util/dnsname"
|
||||||
"tailscale.com/util/set"
|
"tailscale.com/util/set"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
resolvConfPath = "/etc/resolv.conf"
|
resolvConfPath = "/etc/resolv.conf"
|
||||||
defaultClusterDomain = "cluster.local"
|
defaultClusterDomain = "cluster.local"
|
||||||
|
|
||||||
|
reasonProxyCreated = "ProxyCreated"
|
||||||
|
reasonProxyInvalid = "ProxyInvalid"
|
||||||
|
reasonProxyFailed = "ProxyFailed"
|
||||||
|
reasonProxyPending = "ProxyPending"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ServiceReconciler struct {
|
type ServiceReconciler struct {
|
||||||
@ -50,6 +60,8 @@ type ServiceReconciler struct {
|
|||||||
recorder record.EventRecorder
|
recorder record.EventRecorder
|
||||||
|
|
||||||
tsNamespace string
|
tsNamespace string
|
||||||
|
|
||||||
|
clock tstime.Clock
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -76,6 +88,12 @@ func childResourceLabels(name, ns, typ string) map[string]string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *ServiceReconciler) isTailscaleService(svc *corev1.Service) bool {
|
||||||
|
targetIP := tailnetTargetAnnotation(svc)
|
||||||
|
targetFQDN := svc.Annotations[AnnotationTailnetTargetFQDN]
|
||||||
|
return a.shouldExpose(svc) || targetIP != "" || targetFQDN != ""
|
||||||
|
}
|
||||||
|
|
||||||
func (a *ServiceReconciler) Reconcile(ctx context.Context, req reconcile.Request) (_ reconcile.Result, err error) {
|
func (a *ServiceReconciler) Reconcile(ctx context.Context, req reconcile.Request) (_ reconcile.Result, err error) {
|
||||||
logger := a.logger.With("service-ns", req.Namespace, "service-name", req.Name)
|
logger := a.logger.With("service-ns", req.Namespace, "service-name", req.Name)
|
||||||
logger.Debugf("starting reconcile")
|
logger.Debugf("starting reconcile")
|
||||||
@ -90,9 +108,8 @@ func (a *ServiceReconciler) Reconcile(ctx context.Context, req reconcile.Request
|
|||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return reconcile.Result{}, fmt.Errorf("failed to get svc: %w", err)
|
return reconcile.Result{}, fmt.Errorf("failed to get svc: %w", err)
|
||||||
}
|
}
|
||||||
targetIP := tailnetTargetAnnotation(svc)
|
|
||||||
targetFQDN := svc.Annotations[AnnotationTailnetTargetFQDN]
|
if !svc.DeletionTimestamp.IsZero() || !a.isTailscaleService(svc) {
|
||||||
if !svc.DeletionTimestamp.IsZero() || !a.shouldExpose(svc) && targetIP == "" && targetFQDN == "" {
|
|
||||||
logger.Debugf("service is being deleted or is (no longer) referring to Tailscale ingress/egress, ensuring any created resources are cleaned up")
|
logger.Debugf("service is being deleted or is (no longer) referring to Tailscale ingress/egress, ensuring any created resources are cleaned up")
|
||||||
return reconcile.Result{}, a.maybeCleanup(ctx, logger, svc)
|
return reconcile.Result{}, a.maybeCleanup(ctx, logger, svc)
|
||||||
}
|
}
|
||||||
@ -104,7 +121,14 @@ func (a *ServiceReconciler) Reconcile(ctx context.Context, req reconcile.Request
|
|||||||
//
|
//
|
||||||
// This function is responsible for removing the finalizer from the service,
|
// This function is responsible for removing the finalizer from the service,
|
||||||
// once all associated resources are gone.
|
// once all associated resources are gone.
|
||||||
func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.SugaredLogger, svc *corev1.Service) error {
|
func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.SugaredLogger, svc *corev1.Service) (err error) {
|
||||||
|
oldSvcStatus := svc.Status.DeepCopy()
|
||||||
|
defer func() {
|
||||||
|
if !apiequality.Semantic.DeepEqual(oldSvcStatus, svc.Status) {
|
||||||
|
// An error encountered here should get returned by the Reconcile function.
|
||||||
|
err = errors.Join(err, a.Client.Status().Update(ctx, svc))
|
||||||
|
}
|
||||||
|
}()
|
||||||
ix := slices.Index(svc.Finalizers, FinalizerName)
|
ix := slices.Index(svc.Finalizers, FinalizerName)
|
||||||
if ix < 0 {
|
if ix < 0 {
|
||||||
logger.Debugf("no finalizer, nothing to do")
|
logger.Debugf("no finalizer, nothing to do")
|
||||||
@ -114,6 +138,10 @@ func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.Sugare
|
|||||||
a.managedEgressProxies.Remove(svc.UID)
|
a.managedEgressProxies.Remove(svc.UID)
|
||||||
gaugeIngressProxies.Set(int64(a.managedIngressProxies.Len()))
|
gaugeIngressProxies.Set(int64(a.managedIngressProxies.Len()))
|
||||||
gaugeEgressProxies.Set(int64(a.managedEgressProxies.Len()))
|
gaugeEgressProxies.Set(int64(a.managedEgressProxies.Len()))
|
||||||
|
|
||||||
|
if !a.isTailscaleService(svc) {
|
||||||
|
tsoperator.RemoveServiceCondition(svc, tsapi.ProxyReady)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,7 +161,7 @@ func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.Sugare
|
|||||||
// exactly once at the very end of cleanup, because the final step of
|
// exactly once at the very end of cleanup, because the final step of
|
||||||
// cleanup removes the tailscale finalizer, which will make all future
|
// cleanup removes the tailscale finalizer, which will make all future
|
||||||
// reconciles exit early.
|
// reconciles exit early.
|
||||||
logger.Infof("unexposed service from tailnet")
|
logger.Infof("unexposed Service from tailnet")
|
||||||
|
|
||||||
a.mu.Lock()
|
a.mu.Lock()
|
||||||
defer a.mu.Unlock()
|
defer a.mu.Unlock()
|
||||||
@ -141,6 +169,10 @@ func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.Sugare
|
|||||||
a.managedEgressProxies.Remove(svc.UID)
|
a.managedEgressProxies.Remove(svc.UID)
|
||||||
gaugeIngressProxies.Set(int64(a.managedIngressProxies.Len()))
|
gaugeIngressProxies.Set(int64(a.managedIngressProxies.Len()))
|
||||||
gaugeEgressProxies.Set(int64(a.managedEgressProxies.Len()))
|
gaugeEgressProxies.Set(int64(a.managedEgressProxies.Len()))
|
||||||
|
|
||||||
|
if !a.isTailscaleService(svc) {
|
||||||
|
tsoperator.RemoveServiceCondition(svc, tsapi.ProxyReady)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,7 +181,15 @@ func (a *ServiceReconciler) maybeCleanup(ctx context.Context, logger *zap.Sugare
|
|||||||
//
|
//
|
||||||
// This function adds a finalizer to svc, ensuring that we can handle orderly
|
// This function adds a finalizer to svc, ensuring that we can handle orderly
|
||||||
// deprovisioning later.
|
// deprovisioning later.
|
||||||
func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.SugaredLogger, svc *corev1.Service) error {
|
func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.SugaredLogger, svc *corev1.Service) (err error) {
|
||||||
|
oldSvcStatus := svc.Status.DeepCopy()
|
||||||
|
defer func() {
|
||||||
|
if !apiequality.Semantic.DeepEqual(oldSvcStatus, svc.Status) {
|
||||||
|
// An error encountered here should get returned by the Reconcile function.
|
||||||
|
err = errors.Join(err, a.Client.Status().Update(ctx, svc))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
// Run for proxy config related validations here as opposed to running
|
// Run for proxy config related validations here as opposed to running
|
||||||
// them earlier. This is to prevent cleanup being blocked on a
|
// them earlier. This is to prevent cleanup being blocked on a
|
||||||
// misconfigured proxy param.
|
// misconfigured proxy param.
|
||||||
@ -157,30 +197,31 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
msg := fmt.Sprintf("unable to provision proxy resources: invalid config: %v", err)
|
msg := fmt.Sprintf("unable to provision proxy resources: invalid config: %v", err)
|
||||||
a.recorder.Event(svc, corev1.EventTypeWarning, "INVALIDCONFIG", msg)
|
a.recorder.Event(svc, corev1.EventTypeWarning, "INVALIDCONFIG", msg)
|
||||||
a.logger.Error(msg)
|
a.logger.Error(msg)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyInvalid, msg, a.clock, logger)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if violations := validateService(svc); len(violations) > 0 {
|
if violations := validateService(svc); len(violations) > 0 {
|
||||||
msg := fmt.Sprintf("unable to provision proxy resources: invalid Service: %s", strings.Join(violations, ", "))
|
msg := fmt.Sprintf("unable to provision proxy resources: invalid Service: %s", strings.Join(violations, ", "))
|
||||||
a.recorder.Event(svc, corev1.EventTypeWarning, "INVALIDSERVICE", msg)
|
a.recorder.Event(svc, corev1.EventTypeWarning, "INVALIDSERVICE", msg)
|
||||||
a.logger.Error(msg)
|
a.logger.Error(msg)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyInvalid, msg, a.clock, logger)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
proxyClass := proxyClassForObject(svc)
|
proxyClass := proxyClassForObject(svc)
|
||||||
if proxyClass != "" {
|
if proxyClass != "" {
|
||||||
if ready, err := proxyClassIsReady(ctx, proxyClass, a.Client); err != nil {
|
if ready, err := proxyClassIsReady(ctx, proxyClass, a.Client); err != nil {
|
||||||
return fmt.Errorf("error verifying ProxyClass for Service: %w", err)
|
errMsg := fmt.Errorf("error verifying ProxyClass for Service: %w", err)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyFailed, errMsg.Error(), a.clock, logger)
|
||||||
|
return errMsg
|
||||||
} else if !ready {
|
} else if !ready {
|
||||||
logger.Infof("ProxyClass %s specified for the Service, but is not (yet) Ready, waiting..", proxyClass)
|
msg := fmt.Sprintf("ProxyClass %s specified for the Service, but is not (yet) Ready, waiting..", proxyClass)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyPending, msg, a.clock, logger)
|
||||||
|
logger.Info(msg)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hostname, err := nameForService(svc)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !slices.Contains(svc.Finalizers, FinalizerName) {
|
if !slices.Contains(svc.Finalizers, FinalizerName) {
|
||||||
// This log line is printed exactly once during initial provisioning,
|
// This log line is printed exactly once during initial provisioning,
|
||||||
// because once the finalizer is in place this block gets skipped. So,
|
// because once the finalizer is in place this block gets skipped. So,
|
||||||
@ -189,7 +230,9 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
logger.Infof("exposing service over tailscale")
|
logger.Infof("exposing service over tailscale")
|
||||||
svc.Finalizers = append(svc.Finalizers, FinalizerName)
|
svc.Finalizers = append(svc.Finalizers, FinalizerName)
|
||||||
if err := a.Update(ctx, svc); err != nil {
|
if err := a.Update(ctx, svc); err != nil {
|
||||||
return fmt.Errorf("failed to add finalizer: %w", err)
|
errMsg := fmt.Errorf("failed to add finalizer: %w", err)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyFailed, errMsg.Error(), a.clock, logger)
|
||||||
|
return errMsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
crl := childResourceLabels(svc.Name, svc.Namespace, "svc")
|
crl := childResourceLabels(svc.Name, svc.Namespace, "svc")
|
||||||
@ -201,7 +244,7 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
sts := &tailscaleSTSConfig{
|
sts := &tailscaleSTSConfig{
|
||||||
ParentResourceName: svc.Name,
|
ParentResourceName: svc.Name,
|
||||||
ParentResourceUID: string(svc.UID),
|
ParentResourceUID: string(svc.UID),
|
||||||
Hostname: hostname,
|
Hostname: nameForService(svc),
|
||||||
Tags: tags,
|
Tags: tags,
|
||||||
ChildResourceLabels: crl,
|
ChildResourceLabels: crl,
|
||||||
ProxyClassName: proxyClass,
|
ProxyClassName: proxyClass,
|
||||||
@ -233,10 +276,12 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
|
|
||||||
var hsvc *corev1.Service
|
var hsvc *corev1.Service
|
||||||
if hsvc, err = a.ssr.Provision(ctx, logger, sts); err != nil {
|
if hsvc, err = a.ssr.Provision(ctx, logger, sts); err != nil {
|
||||||
return fmt.Errorf("failed to provision: %w", err)
|
errMsg := fmt.Errorf("failed to provision: %w", err)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyFailed, errMsg.Error(), a.clock, logger)
|
||||||
|
return errMsg
|
||||||
}
|
}
|
||||||
|
|
||||||
if sts.TailnetTargetIP != "" || sts.TailnetTargetFQDN != "" {
|
if sts.TailnetTargetIP != "" || sts.TailnetTargetFQDN != "" { // if an egress proxy
|
||||||
clusterDomain := retrieveClusterDomain(a.tsNamespace, logger)
|
clusterDomain := retrieveClusterDomain(a.tsNamespace, logger)
|
||||||
headlessSvcName := hsvc.Name + "." + hsvc.Namespace + ".svc." + clusterDomain
|
headlessSvcName := hsvc.Name + "." + hsvc.Namespace + ".svc." + clusterDomain
|
||||||
if svc.Spec.ExternalName != headlessSvcName || svc.Spec.Type != corev1.ServiceTypeExternalName {
|
if svc.Spec.ExternalName != headlessSvcName || svc.Spec.Type != corev1.ServiceTypeExternalName {
|
||||||
@ -244,14 +289,18 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
svc.Spec.Selector = nil
|
svc.Spec.Selector = nil
|
||||||
svc.Spec.Type = corev1.ServiceTypeExternalName
|
svc.Spec.Type = corev1.ServiceTypeExternalName
|
||||||
if err := a.Update(ctx, svc); err != nil {
|
if err := a.Update(ctx, svc); err != nil {
|
||||||
return fmt.Errorf("failed to update service: %w", err)
|
errMsg := fmt.Errorf("failed to update service: %w", err)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyFailed, errMsg.Error(), a.clock, logger)
|
||||||
|
return errMsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionTrue, reasonProxyCreated, reasonProxyCreated, a.clock, logger)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isTailscaleLoadBalancerService(svc, a.isDefaultLoadBalancer) {
|
if !isTailscaleLoadBalancerService(svc, a.isDefaultLoadBalancer) {
|
||||||
logger.Debugf("service is not a LoadBalancer, so not updating ingress")
|
logger.Debugf("service is not a LoadBalancer, so not updating ingress")
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionTrue, reasonProxyCreated, reasonProxyCreated, a.clock, logger)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,22 +309,23 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
return fmt.Errorf("failed to get device ID: %w", err)
|
return fmt.Errorf("failed to get device ID: %w", err)
|
||||||
}
|
}
|
||||||
if tsHost == "" {
|
if tsHost == "" {
|
||||||
logger.Debugf("no Tailscale hostname known yet, waiting for proxy pod to finish auth")
|
msg := "no Tailscale hostname known yet, waiting for proxy pod to finish auth"
|
||||||
|
logger.Debug(msg)
|
||||||
// No hostname yet. Wait for the proxy pod to auth.
|
// No hostname yet. Wait for the proxy pod to auth.
|
||||||
svc.Status.LoadBalancer.Ingress = nil
|
svc.Status.LoadBalancer.Ingress = nil
|
||||||
if err := a.Status().Update(ctx, svc); err != nil {
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyPending, msg, a.clock, logger)
|
||||||
return fmt.Errorf("failed to update service status: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Debugf("setting ingress to %q, %s", tsHost, strings.Join(tsIPs, ", "))
|
logger.Debugf("setting Service LoadBalancer status to %q, %s", tsHost, strings.Join(tsIPs, ", "))
|
||||||
ingress := []corev1.LoadBalancerIngress{
|
ingress := []corev1.LoadBalancerIngress{
|
||||||
{Hostname: tsHost},
|
{Hostname: tsHost},
|
||||||
}
|
}
|
||||||
clusterIPAddr, err := netip.ParseAddr(svc.Spec.ClusterIP)
|
clusterIPAddr, err := netip.ParseAddr(svc.Spec.ClusterIP)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to parse cluster IP: %w", err)
|
msg := fmt.Sprintf("failed to parse cluster IP: %v", err)
|
||||||
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionFalse, reasonProxyFailed, msg, a.clock, logger)
|
||||||
|
return fmt.Errorf(msg)
|
||||||
}
|
}
|
||||||
for _, ip := range tsIPs {
|
for _, ip := range tsIPs {
|
||||||
addr, err := netip.ParseAddr(ip)
|
addr, err := netip.ParseAddr(ip)
|
||||||
@ -287,9 +337,7 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
svc.Status.LoadBalancer.Ingress = ingress
|
svc.Status.LoadBalancer.Ingress = ingress
|
||||||
if err := a.Status().Update(ctx, svc); err != nil {
|
tsoperator.SetServiceCondition(svc, tsapi.ProxyReady, metav1.ConditionTrue, reasonProxyCreated, reasonProxyCreated, a.clock, logger)
|
||||||
return fmt.Errorf("failed to update service status: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -303,6 +351,14 @@ func validateService(svc *corev1.Service) []string {
|
|||||||
violations = append(violations, fmt.Sprintf("invalid value of annotation %s: %q does not appear to be a valid MagicDNS name", AnnotationTailnetTargetFQDN, fqdn))
|
violations = append(violations, fmt.Sprintf("invalid value of annotation %s: %q does not appear to be a valid MagicDNS name", AnnotationTailnetTargetFQDN, fqdn))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
svcName := nameForService(svc)
|
||||||
|
if err := dnsname.ValidLabel(svcName); err != nil {
|
||||||
|
if _, ok := svc.Annotations[AnnotationHostname]; ok {
|
||||||
|
violations = append(violations, fmt.Sprintf("invalid Tailscale hostname specified %q: %s", svcName, err))
|
||||||
|
} else {
|
||||||
|
violations = append(violations, fmt.Sprintf("invalid Tailscale hostname %q, use %q annotation to override: %s", svcName, AnnotationHostname, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
return violations
|
return violations
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -334,7 +390,7 @@ func hasExposeAnnotation(svc *corev1.Service) bool {
|
|||||||
return svc != nil && svc.Annotations[AnnotationExpose] == "true"
|
return svc != nil && svc.Annotations[AnnotationExpose] == "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
// hasTailnetTargetAnnotation returns the value of tailscale.com/tailnet-ip
|
// tailnetTargetAnnotation returns the value of tailscale.com/tailnet-ip
|
||||||
// annotation or of the deprecated tailscale.com/ts-tailnet-target-ip
|
// annotation or of the deprecated tailscale.com/ts-tailnet-target-ip
|
||||||
// annotation. If neither is set, it returns an empty string. If both are set,
|
// annotation. If neither is set, it returns an empty string. If both are set,
|
||||||
// it returns the value of the new annotation.
|
// it returns the value of the new annotation.
|
||||||
|
|||||||
@ -304,10 +304,6 @@ func expectedSTSUserspace(t *testing.T, cl client.Client, opts configOpts) *apps
|
|||||||
|
|
||||||
func expectedHeadlessService(name string, parentType string) *corev1.Service {
|
func expectedHeadlessService(name string, parentType string) *corev1.Service {
|
||||||
return &corev1.Service{
|
return &corev1.Service{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Service",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: name,
|
Name: name,
|
||||||
GenerateName: "ts-test-",
|
GenerateName: "ts-test-",
|
||||||
@ -331,10 +327,6 @@ func expectedHeadlessService(name string, parentType string) *corev1.Service {
|
|||||||
func expectedSecret(t *testing.T, cl client.Client, opts configOpts) *corev1.Secret {
|
func expectedSecret(t *testing.T, cl client.Client, opts configOpts) *corev1.Secret {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
s := &corev1.Secret{
|
s := &corev1.Secret{
|
||||||
TypeMeta: metav1.TypeMeta{
|
|
||||||
Kind: "Secret",
|
|
||||||
APIVersion: "v1",
|
|
||||||
},
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: opts.secretName,
|
Name: opts.secretName,
|
||||||
Namespace: "operator-ns",
|
Namespace: "operator-ns",
|
||||||
|
|||||||
41
go.mod
41
go.mod
@ -30,7 +30,7 @@ require (
|
|||||||
github.com/dsnet/try v0.0.3
|
github.com/dsnet/try v0.0.3
|
||||||
github.com/evanw/esbuild v0.19.11
|
github.com/evanw/esbuild v0.19.11
|
||||||
github.com/frankban/quicktest v1.14.6
|
github.com/frankban/quicktest v1.14.6
|
||||||
github.com/fxamacker/cbor/v2 v2.5.0
|
github.com/fxamacker/cbor/v2 v2.6.0
|
||||||
github.com/gaissmai/bart v0.4.1
|
github.com/gaissmai/bart v0.4.1
|
||||||
github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0
|
github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0
|
||||||
github.com/go-logr/zapr v1.3.0
|
github.com/go-logr/zapr v1.3.0
|
||||||
@ -94,29 +94,29 @@ require (
|
|||||||
go.uber.org/zap v1.26.0
|
go.uber.org/zap v1.26.0
|
||||||
go4.org/mem v0.0.0-20220726221520-4f986261bf13
|
go4.org/mem v0.0.0-20220726221520-4f986261bf13
|
||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
|
||||||
golang.org/x/crypto v0.21.0
|
golang.org/x/crypto v0.24.0
|
||||||
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
|
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
|
||||||
golang.org/x/mod v0.16.0
|
golang.org/x/mod v0.18.0
|
||||||
golang.org/x/net v0.23.0
|
golang.org/x/net v0.26.0
|
||||||
golang.org/x/oauth2 v0.16.0
|
golang.org/x/oauth2 v0.16.0
|
||||||
golang.org/x/sync v0.6.0
|
golang.org/x/sync v0.7.0
|
||||||
golang.org/x/sys v0.19.0
|
golang.org/x/sys v0.21.0
|
||||||
golang.org/x/term v0.18.0
|
golang.org/x/term v0.21.0
|
||||||
golang.org/x/time v0.5.0
|
golang.org/x/time v0.5.0
|
||||||
golang.org/x/tools v0.19.0
|
golang.org/x/tools v0.22.0
|
||||||
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
|
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
|
||||||
golang.zx2c4.com/wireguard/windows v0.5.3
|
golang.zx2c4.com/wireguard/windows v0.5.3
|
||||||
gopkg.in/square/go-jose.v2 v2.6.0
|
gopkg.in/square/go-jose.v2 v2.6.0
|
||||||
gvisor.dev/gvisor v0.0.0-20240306221502-ee1e1f6070e3
|
gvisor.dev/gvisor v0.0.0-20240306221502-ee1e1f6070e3
|
||||||
honnef.co/go/tools v0.4.6
|
honnef.co/go/tools v0.4.6
|
||||||
k8s.io/api v0.29.1
|
k8s.io/api v0.30.1
|
||||||
k8s.io/apimachinery v0.29.1
|
k8s.io/apimachinery v0.30.1
|
||||||
k8s.io/apiserver v0.29.1
|
k8s.io/apiserver v0.30.1
|
||||||
k8s.io/client-go v0.29.1
|
k8s.io/client-go v0.30.1
|
||||||
modernc.org/sqlite v1.29.10
|
modernc.org/sqlite v1.29.10
|
||||||
nhooyr.io/websocket v1.8.10
|
nhooyr.io/websocket v1.8.10
|
||||||
sigs.k8s.io/controller-runtime v0.16.2
|
sigs.k8s.io/controller-runtime v0.18.4
|
||||||
sigs.k8s.io/controller-tools v0.13.0
|
sigs.k8s.io/controller-tools v0.15.1-0.20240618033008-7824932b0cab
|
||||||
sigs.k8s.io/yaml v1.4.0
|
sigs.k8s.io/yaml v1.4.0
|
||||||
software.sslmate.com/src/go-pkcs12 v0.4.0
|
software.sslmate.com/src/go-pkcs12 v0.4.0
|
||||||
)
|
)
|
||||||
@ -208,8 +208,8 @@ require (
|
|||||||
github.com/esimonov/ifshort v1.0.4 // indirect
|
github.com/esimonov/ifshort v1.0.4 // indirect
|
||||||
github.com/ettle/strcase v0.1.1 // indirect
|
github.com/ettle/strcase v0.1.1 // indirect
|
||||||
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
|
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
|
||||||
github.com/evanphx/json-patch/v5 v5.8.1 // indirect
|
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
|
||||||
github.com/fatih/color v1.15.0 // indirect
|
github.com/fatih/color v1.16.0 // indirect
|
||||||
github.com/fatih/structtag v1.2.0 // indirect
|
github.com/fatih/structtag v1.2.0 // indirect
|
||||||
github.com/firefart/nonamedreturns v1.0.4 // indirect
|
github.com/firefart/nonamedreturns v1.0.4 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.7.0
|
github.com/fsnotify/fsnotify v1.7.0
|
||||||
@ -233,7 +233,7 @@ require (
|
|||||||
github.com/gobwas/glob v0.2.3 // indirect
|
github.com/gobwas/glob v0.2.3 // indirect
|
||||||
github.com/gofrs/flock v0.8.1 // indirect
|
github.com/gofrs/flock v0.8.1 // indirect
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
github.com/gogo/protobuf v1.3.2 // indirect
|
||||||
github.com/golang/protobuf v1.5.3 // indirect
|
github.com/golang/protobuf v1.5.4 // indirect
|
||||||
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
|
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
|
||||||
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
|
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
|
||||||
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
|
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
|
||||||
@ -377,7 +377,7 @@ require (
|
|||||||
go.uber.org/multierr v1.11.0 // indirect
|
go.uber.org/multierr v1.11.0 // indirect
|
||||||
golang.org/x/exp/typeparams v0.0.0-20240119083558-1b970713d09a // indirect
|
golang.org/x/exp/typeparams v0.0.0-20240119083558-1b970713d09a // indirect
|
||||||
golang.org/x/image v0.15.0 // indirect
|
golang.org/x/image v0.15.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.16.0 // indirect
|
||||||
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
|
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
|
||||||
google.golang.org/appengine v1.6.8 // indirect
|
google.golang.org/appengine v1.6.8 // indirect
|
||||||
google.golang.org/protobuf v1.33.0 // indirect
|
google.golang.org/protobuf v1.33.0 // indirect
|
||||||
@ -387,10 +387,9 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
howett.net/plist v1.0.0 // indirect
|
howett.net/plist v1.0.0 // indirect
|
||||||
k8s.io/apiextensions-apiserver v0.29.1 // indirect
|
k8s.io/apiextensions-apiserver v0.30.1 // indirect
|
||||||
k8s.io/component-base v0.29.1 // indirect
|
|
||||||
k8s.io/klog/v2 v2.120.1 // indirect
|
k8s.io/klog/v2 v2.120.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 // indirect
|
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
|
||||||
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
|
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
|
||||||
mvdan.cc/gofumpt v0.5.0 // indirect
|
mvdan.cc/gofumpt v0.5.0 // indirect
|
||||||
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
|
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
|
||||||
|
|||||||
90
go.sum
90
go.sum
@ -285,12 +285,12 @@ github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw=
|
|||||||
github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY=
|
github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY=
|
||||||
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
|
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
|
||||||
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||||
github.com/evanphx/json-patch/v5 v5.8.1 h1:iPEdwg0XayoS+E7Mth9JxwUtOgyVxnDTXHtKhZPlZxA=
|
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
|
||||||
github.com/evanphx/json-patch/v5 v5.8.1/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
|
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
|
||||||
github.com/evanw/esbuild v0.19.11 h1:mbPO1VJ/df//jjUd+p/nRLYCpizXxXb2w/zZMShxa2k=
|
github.com/evanw/esbuild v0.19.11 h1:mbPO1VJ/df//jjUd+p/nRLYCpizXxXb2w/zZMShxa2k=
|
||||||
github.com/evanw/esbuild v0.19.11/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
|
github.com/evanw/esbuild v0.19.11/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
|
||||||
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
|
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
|
||||||
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
|
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
|
||||||
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
||||||
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
||||||
github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=
|
github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=
|
||||||
@ -299,8 +299,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
|
|||||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
||||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||||
github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE=
|
github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=
|
||||||
github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
|
github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
|
||||||
github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
|
github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
|
||||||
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
|
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
|
||||||
github.com/gaissmai/bart v0.4.1 h1:G1t58voWkNmT47lBDawH5QhtTDsdqRIO+ftq5x4P9Ls=
|
github.com/gaissmai/bart v0.4.1 h1:G1t58voWkNmT47lBDawH5QhtTDsdqRIO+ftq5x4P9Ls=
|
||||||
@ -407,8 +407,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
|
|||||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||||
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
||||||
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
|
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
|
||||||
@ -715,10 +715,10 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
|
|||||||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||||
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
||||||
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||||
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
|
github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
|
||||||
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
|
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
|
||||||
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
|
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
|
||||||
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
|
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
|
||||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
||||||
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
|
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
|
||||||
github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
|
github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
|
||||||
@ -1012,8 +1012,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
|
|||||||
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||||
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
|
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
|
||||||
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
|
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -1062,8 +1062,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
|
|||||||
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
|
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
|
||||||
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
|
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
|
||||||
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
@ -1108,8 +1108,8 @@ golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
|
|||||||
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
|
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
|
||||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||||
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
|
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
|
||||||
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@ -1135,8 +1135,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -1203,8 +1203,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||||||
golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
|
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
@ -1213,8 +1213,8 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
|
|||||||
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
|
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||||
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
|
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
|
||||||
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
|
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
@ -1229,8 +1229,8 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|||||||
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
@ -1309,8 +1309,8 @@ golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
|
|||||||
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
|
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
|
||||||
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
|
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
|
||||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
|
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
|
||||||
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
|
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
@ -1459,22 +1459,20 @@ honnef.co/go/tools v0.4.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8=
|
|||||||
honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0=
|
honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0=
|
||||||
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
|
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
|
||||||
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
|
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
|
||||||
k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw=
|
k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
|
||||||
k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ=
|
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
|
||||||
k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw=
|
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
|
||||||
k8s.io/apiextensions-apiserver v0.29.1/go.mod h1:zZECpujY5yTW58co8V2EQR4BD6A9pktVgHhvc0uLfeU=
|
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
|
||||||
k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc=
|
k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
|
||||||
k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
|
k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
|
||||||
k8s.io/apiserver v0.29.1 h1:e2wwHUfEmMsa8+cuft8MT56+16EONIEK8A/gpBSco+g=
|
k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
|
||||||
k8s.io/apiserver v0.29.1/go.mod h1:V0EpkTRrJymyVT3M49we8uh2RvXf7fWC5XLB0P3SwRw=
|
k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
|
||||||
k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A=
|
k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
|
||||||
k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks=
|
k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
|
||||||
k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw=
|
|
||||||
k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc=
|
|
||||||
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
|
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
|
||||||
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
|
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
|
||||||
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 h1:m6dl1pkxz3HuE2mP9MUYPCCGyy6IIFlv/vTlLBDxIwA=
|
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
|
||||||
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
|
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
|
||||||
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
|
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
|
||||||
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
|
modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
|
||||||
@ -1516,10 +1514,10 @@ nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+
|
|||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||||
sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU=
|
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
|
||||||
sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU=
|
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
|
||||||
sigs.k8s.io/controller-tools v0.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI=
|
sigs.k8s.io/controller-tools v0.15.1-0.20240618033008-7824932b0cab h1:Fq4VD28nejtsijBNTeRRy9Tt3FVwq+o6NB7fIxja8uY=
|
||||||
sigs.k8s.io/controller-tools v0.13.0/go.mod h1:5vw3En2NazbejQGCeWKRrE7q4P+CW8/klfVqP8QZkgA=
|
sigs.k8s.io/controller-tools v0.15.1-0.20240618033008-7824932b0cab/go.mod h1:egedX5jq2KrZ3A2zaOz3e2DSsh5BhFyyjvNcBRIQel8=
|
||||||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
|
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
|
||||||
|
|||||||
1583
k8s-operator/api.md
1583
k8s-operator/api.md
File diff suppressed because it is too large
Load Diff
@ -148,7 +148,7 @@ type ConnectorStatus struct {
|
|||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []ConnectorCondition `json:"conditions"`
|
Conditions []metav1.Condition `json:"conditions"`
|
||||||
// SubnetRoutes are the routes currently exposed to tailnet via this
|
// SubnetRoutes are the routes currently exposed to tailnet via this
|
||||||
// Connector instance.
|
// Connector instance.
|
||||||
// +optional
|
// +optional
|
||||||
@ -167,42 +167,10 @@ type ConnectorStatus struct {
|
|||||||
Hostname string `json:"hostname,omitempty"`
|
Hostname string `json:"hostname,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConnectorCondition contains condition information for a Connector.
|
type ConditionType string
|
||||||
type ConnectorCondition struct {
|
|
||||||
// Type of the condition, known values are (`SubnetRouterReady`).
|
|
||||||
Type ConnectorConditionType `json:"type"`
|
|
||||||
|
|
||||||
// Status of the condition, one of ('True', 'False', 'Unknown').
|
|
||||||
Status metav1.ConditionStatus `json:"status"`
|
|
||||||
|
|
||||||
// LastTransitionTime is the timestamp corresponding to the last status
|
|
||||||
// change of this condition.
|
|
||||||
// +optional
|
|
||||||
LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
|
|
||||||
|
|
||||||
// Reason is a brief machine readable explanation for the condition's last
|
|
||||||
// transition.
|
|
||||||
// +optional
|
|
||||||
Reason string `json:"reason,omitempty"`
|
|
||||||
|
|
||||||
// Message is a human readable description of the details of the last
|
|
||||||
// transition, complementing reason.
|
|
||||||
// +optional
|
|
||||||
Message string `json:"message,omitempty"`
|
|
||||||
|
|
||||||
// If set, this represents the .metadata.generation that the condition was
|
|
||||||
// set based upon.
|
|
||||||
// For instance, if .metadata.generation is currently 12, but the
|
|
||||||
// .status.condition[x].observedGeneration is 9, the condition is out of date
|
|
||||||
// with respect to the current state of the Connector.
|
|
||||||
// +optional
|
|
||||||
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConnectorConditionType represents a Connector condition type.
|
|
||||||
type ConnectorConditionType string
|
|
||||||
|
|
||||||
const (
|
const (
|
||||||
ConnectorReady ConnectorConditionType = `ConnectorReady`
|
ConnectorReady ConditionType = `ConnectorReady`
|
||||||
ProxyClassready ConnectorConditionType = `ProxyClassReady`
|
ProxyClassready ConditionType = `ProxyClassReady`
|
||||||
|
ProxyReady ConditionType = `TailscaleProxyReady` // a Tailscale-specific condition type for corev1.Service
|
||||||
)
|
)
|
||||||
|
|||||||
@ -232,5 +232,5 @@ type ProxyClassStatus struct {
|
|||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []ConnectorCondition `json:"conditions,omitempty"`
|
Conditions []metav1.Condition `json:"conditions,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
@ -96,7 +96,7 @@ type DNSConfigStatus struct {
|
|||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []ConnectorCondition `json:"conditions"`
|
Conditions []metav1.Condition `json:"conditions"`
|
||||||
// Nameserver describes the status of nameserver cluster resources.
|
// Nameserver describes the status of nameserver cluster resources.
|
||||||
// +optional
|
// +optional
|
||||||
Nameserver *NameserverStatus `json:"nameserver"`
|
Nameserver *NameserverStatus `json:"nameserver"`
|
||||||
@ -115,4 +115,4 @@ type NameserverStatus struct {
|
|||||||
|
|
||||||
// NameserverReady is set to True if the nameserver has been successfully
|
// NameserverReady is set to True if the nameserver has been successfully
|
||||||
// deployed to cluster.
|
// deployed to cluster.
|
||||||
const NameserverReady ConnectorConditionType = `NameserverReady`
|
const NameserverReady ConditionType = `NameserverReady`
|
||||||
|
|||||||
@ -8,7 +8,8 @@
|
|||||||
package v1alpha1
|
package v1alpha1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"k8s.io/api/core/v1"
|
corev1 "k8s.io/api/core/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -39,25 +40,6 @@ func (in *Connector) DeepCopyObject() runtime.Object {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
|
||||||
func (in *ConnectorCondition) DeepCopyInto(out *ConnectorCondition) {
|
|
||||||
*out = *in
|
|
||||||
if in.LastTransitionTime != nil {
|
|
||||||
in, out := &in.LastTransitionTime, &out.LastTransitionTime
|
|
||||||
*out = (*in).DeepCopy()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConnectorCondition.
|
|
||||||
func (in *ConnectorCondition) DeepCopy() *ConnectorCondition {
|
|
||||||
if in == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
out := new(ConnectorCondition)
|
|
||||||
in.DeepCopyInto(out)
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||||
func (in *ConnectorList) DeepCopyInto(out *ConnectorList) {
|
func (in *ConnectorList) DeepCopyInto(out *ConnectorList) {
|
||||||
*out = *in
|
*out = *in
|
||||||
@ -120,7 +102,7 @@ func (in *ConnectorStatus) DeepCopyInto(out *ConnectorStatus) {
|
|||||||
*out = *in
|
*out = *in
|
||||||
if in.Conditions != nil {
|
if in.Conditions != nil {
|
||||||
in, out := &in.Conditions, &out.Conditions
|
in, out := &in.Conditions, &out.Conditions
|
||||||
*out = make([]ConnectorCondition, len(*in))
|
*out = make([]v1.Condition, len(*in))
|
||||||
for i := range *in {
|
for i := range *in {
|
||||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||||
}
|
}
|
||||||
@ -153,7 +135,7 @@ func (in *Container) DeepCopyInto(out *Container) {
|
|||||||
in.Resources.DeepCopyInto(&out.Resources)
|
in.Resources.DeepCopyInto(&out.Resources)
|
||||||
if in.SecurityContext != nil {
|
if in.SecurityContext != nil {
|
||||||
in, out := &in.SecurityContext, &out.SecurityContext
|
in, out := &in.SecurityContext, &out.SecurityContext
|
||||||
*out = new(v1.SecurityContext)
|
*out = new(corev1.SecurityContext)
|
||||||
(*in).DeepCopyInto(*out)
|
(*in).DeepCopyInto(*out)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -252,7 +234,7 @@ func (in *DNSConfigStatus) DeepCopyInto(out *DNSConfigStatus) {
|
|||||||
*out = *in
|
*out = *in
|
||||||
if in.Conditions != nil {
|
if in.Conditions != nil {
|
||||||
in, out := &in.Conditions, &out.Conditions
|
in, out := &in.Conditions, &out.Conditions
|
||||||
*out = make([]ConnectorCondition, len(*in))
|
*out = make([]v1.Condition, len(*in))
|
||||||
for i := range *in {
|
for i := range *in {
|
||||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||||
}
|
}
|
||||||
@ -373,7 +355,7 @@ func (in *Pod) DeepCopyInto(out *Pod) {
|
|||||||
}
|
}
|
||||||
if in.Affinity != nil {
|
if in.Affinity != nil {
|
||||||
in, out := &in.Affinity, &out.Affinity
|
in, out := &in.Affinity, &out.Affinity
|
||||||
*out = new(v1.Affinity)
|
*out = new(corev1.Affinity)
|
||||||
(*in).DeepCopyInto(*out)
|
(*in).DeepCopyInto(*out)
|
||||||
}
|
}
|
||||||
if in.TailscaleContainer != nil {
|
if in.TailscaleContainer != nil {
|
||||||
@ -388,12 +370,12 @@ func (in *Pod) DeepCopyInto(out *Pod) {
|
|||||||
}
|
}
|
||||||
if in.SecurityContext != nil {
|
if in.SecurityContext != nil {
|
||||||
in, out := &in.SecurityContext, &out.SecurityContext
|
in, out := &in.SecurityContext, &out.SecurityContext
|
||||||
*out = new(v1.PodSecurityContext)
|
*out = new(corev1.PodSecurityContext)
|
||||||
(*in).DeepCopyInto(*out)
|
(*in).DeepCopyInto(*out)
|
||||||
}
|
}
|
||||||
if in.ImagePullSecrets != nil {
|
if in.ImagePullSecrets != nil {
|
||||||
in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
|
in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
|
||||||
*out = make([]v1.LocalObjectReference, len(*in))
|
*out = make([]corev1.LocalObjectReference, len(*in))
|
||||||
copy(*out, *in)
|
copy(*out, *in)
|
||||||
}
|
}
|
||||||
if in.NodeSelector != nil {
|
if in.NodeSelector != nil {
|
||||||
@ -405,7 +387,7 @@ func (in *Pod) DeepCopyInto(out *Pod) {
|
|||||||
}
|
}
|
||||||
if in.Tolerations != nil {
|
if in.Tolerations != nil {
|
||||||
in, out := &in.Tolerations, &out.Tolerations
|
in, out := &in.Tolerations, &out.Tolerations
|
||||||
*out = make([]v1.Toleration, len(*in))
|
*out = make([]corev1.Toleration, len(*in))
|
||||||
for i := range *in {
|
for i := range *in {
|
||||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||||
}
|
}
|
||||||
@ -516,7 +498,7 @@ func (in *ProxyClassStatus) DeepCopyInto(out *ProxyClassStatus) {
|
|||||||
*out = *in
|
*out = *in
|
||||||
if in.Conditions != nil {
|
if in.Conditions != nil {
|
||||||
in, out := &in.Conditions, &out.Conditions
|
in, out := &in.Conditions, &out.Conditions
|
||||||
*out = make([]ConnectorCondition, len(*in))
|
*out = make([]v1.Condition, len(*in))
|
||||||
for i := range *in {
|
for i := range *in {
|
||||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
xslices "golang.org/x/exp/slices"
|
xslices "golang.org/x/exp/slices"
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
|
||||||
"tailscale.com/tstime"
|
"tailscale.com/tstime"
|
||||||
@ -19,22 +20,22 @@
|
|||||||
// SetConnectorCondition ensures that Connector status has a condition with the
|
// SetConnectorCondition ensures that Connector status has a condition with the
|
||||||
// given attributes. LastTransitionTime gets set every time condition's status
|
// given attributes. LastTransitionTime gets set every time condition's status
|
||||||
// changes.
|
// changes.
|
||||||
func SetConnectorCondition(cn *tsapi.Connector, conditionType tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
func SetConnectorCondition(cn *tsapi.Connector, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
||||||
conds := updateCondition(cn.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
conds := updateCondition(cn.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
||||||
cn.Status.Conditions = conds
|
cn.Status.Conditions = conds
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveConnectorCondition will remove condition of the given type if it exists.
|
// RemoveConnectorCondition will remove condition of the given type if it exists.
|
||||||
func RemoveConnectorCondition(conn *tsapi.Connector, conditionType tsapi.ConnectorConditionType) {
|
func RemoveConnectorCondition(conn *tsapi.Connector, conditionType tsapi.ConditionType) {
|
||||||
conn.Status.Conditions = slices.DeleteFunc(conn.Status.Conditions, func(cond tsapi.ConnectorCondition) bool {
|
conn.Status.Conditions = slices.DeleteFunc(conn.Status.Conditions, func(cond metav1.Condition) bool {
|
||||||
return cond.Type == conditionType
|
return cond.Type == string(conditionType)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetProxyClassCondition ensures that ProxyClass status has a condition with the
|
// SetProxyClassCondition ensures that ProxyClass status has a condition with the
|
||||||
// given attributes. LastTransitionTime gets set every time condition's status
|
// given attributes. LastTransitionTime gets set every time condition's status
|
||||||
// changes.
|
// changes.
|
||||||
func SetProxyClassCondition(pc *tsapi.ProxyClass, conditionType tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
func SetProxyClassCondition(pc *tsapi.ProxyClass, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
||||||
conds := updateCondition(pc.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
conds := updateCondition(pc.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
||||||
pc.Status.Conditions = conds
|
pc.Status.Conditions = conds
|
||||||
}
|
}
|
||||||
@ -42,14 +43,29 @@ func SetProxyClassCondition(pc *tsapi.ProxyClass, conditionType tsapi.ConnectorC
|
|||||||
// SetDNSConfigCondition ensures that DNSConfig status has a condition with the
|
// SetDNSConfigCondition ensures that DNSConfig status has a condition with the
|
||||||
// given attributes. LastTransitionTime gets set every time condition's status
|
// given attributes. LastTransitionTime gets set every time condition's status
|
||||||
// changes
|
// changes
|
||||||
func SetDNSConfigCondition(dnsCfg *tsapi.DNSConfig, conditionType tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
func SetDNSConfigCondition(dnsCfg *tsapi.DNSConfig, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) {
|
||||||
conds := updateCondition(dnsCfg.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
conds := updateCondition(dnsCfg.Status.Conditions, conditionType, status, reason, message, gen, clock, logger)
|
||||||
dnsCfg.Status.Conditions = conds
|
dnsCfg.Status.Conditions = conds
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateCondition(conds []tsapi.ConnectorCondition, conditionType tsapi.ConnectorConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) []tsapi.ConnectorCondition {
|
// SetServiceCondition ensures that Service status has a condition with the
|
||||||
newCondition := tsapi.ConnectorCondition{
|
// given attributes. LastTransitionTime gets set every time condition's status
|
||||||
Type: conditionType,
|
// changes.
|
||||||
|
func SetServiceCondition(svc *corev1.Service, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string, clock tstime.Clock, logger *zap.SugaredLogger) {
|
||||||
|
conds := updateCondition(svc.Status.Conditions, conditionType, status, reason, message, 0, clock, logger)
|
||||||
|
svc.Status.Conditions = conds
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveServiceCondition will remove condition of the given type if it exists.
|
||||||
|
func RemoveServiceCondition(svc *corev1.Service, conditionType tsapi.ConditionType) {
|
||||||
|
svc.Status.Conditions = slices.DeleteFunc(svc.Status.Conditions, func(cond metav1.Condition) bool {
|
||||||
|
return cond.Type == string(conditionType)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateCondition(conds []metav1.Condition, conditionType tsapi.ConditionType, status metav1.ConditionStatus, reason, message string, gen int64, clock tstime.Clock, logger *zap.SugaredLogger) []metav1.Condition {
|
||||||
|
newCondition := metav1.Condition{
|
||||||
|
Type: string(conditionType),
|
||||||
Status: status,
|
Status: status,
|
||||||
Reason: reason,
|
Reason: reason,
|
||||||
Message: message,
|
Message: message,
|
||||||
@ -57,10 +73,10 @@ func updateCondition(conds []tsapi.ConnectorCondition, conditionType tsapi.Conne
|
|||||||
}
|
}
|
||||||
|
|
||||||
nowTime := metav1.NewTime(clock.Now().Truncate(time.Second))
|
nowTime := metav1.NewTime(clock.Now().Truncate(time.Second))
|
||||||
newCondition.LastTransitionTime = &nowTime
|
newCondition.LastTransitionTime = nowTime
|
||||||
|
|
||||||
idx := xslices.IndexFunc(conds, func(cond tsapi.ConnectorCondition) bool {
|
idx := xslices.IndexFunc(conds, func(cond metav1.Condition) bool {
|
||||||
return cond.Type == conditionType
|
return cond.Type == string(conditionType)
|
||||||
})
|
})
|
||||||
|
|
||||||
if idx == -1 {
|
if idx == -1 {
|
||||||
@ -82,8 +98,8 @@ func updateCondition(conds []tsapi.ConnectorCondition, conditionType tsapi.Conne
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ProxyClassIsReady(pc *tsapi.ProxyClass) bool {
|
func ProxyClassIsReady(pc *tsapi.ProxyClass) bool {
|
||||||
idx := xslices.IndexFunc(pc.Status.Conditions, func(cond tsapi.ConnectorCondition) bool {
|
idx := xslices.IndexFunc(pc.Status.Conditions, func(cond metav1.Condition) bool {
|
||||||
return cond.Type == tsapi.ProxyClassready
|
return cond.Type == string(tsapi.ProxyClassready)
|
||||||
})
|
})
|
||||||
if idx == -1 {
|
if idx == -1 {
|
||||||
return false
|
return false
|
||||||
@ -93,8 +109,8 @@ func ProxyClassIsReady(pc *tsapi.ProxyClass) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DNSCfgIsReady(cfg *tsapi.DNSConfig) bool {
|
func DNSCfgIsReady(cfg *tsapi.DNSConfig) bool {
|
||||||
idx := xslices.IndexFunc(cfg.Status.Conditions, func(cond tsapi.ConnectorCondition) bool {
|
idx := xslices.IndexFunc(cfg.Status.Conditions, func(cond metav1.Condition) bool {
|
||||||
return cond.Type == tsapi.NameserverReady
|
return cond.Type == string(tsapi.NameserverReady)
|
||||||
})
|
})
|
||||||
if idx == -1 {
|
if idx == -1 {
|
||||||
return false
|
return false
|
||||||
|
|||||||
@ -28,14 +28,14 @@ func TestSetConnectorCondition(t *testing.T) {
|
|||||||
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "someReason", "someMsg", 1, clock, zl.Sugar())
|
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "someReason", "someMsg", 1, clock, zl.Sugar())
|
||||||
assert.Equal(t, cn, tsapi.Connector{
|
assert.Equal(t, cn, tsapi.Connector{
|
||||||
Status: tsapi.ConnectorStatus{
|
Status: tsapi.ConnectorStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{
|
Conditions: []metav1.Condition{
|
||||||
{
|
{
|
||||||
Type: tsapi.ConnectorReady,
|
Type: string(tsapi.ConnectorReady),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: "someReason",
|
Reason: "someReason",
|
||||||
Message: "someMsg",
|
Message: "someMsg",
|
||||||
ObservedGeneration: 1,
|
ObservedGeneration: 1,
|
||||||
LastTransitionTime: &fakeNow,
|
LastTransitionTime: fakeNow,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -43,28 +43,28 @@ func TestSetConnectorCondition(t *testing.T) {
|
|||||||
|
|
||||||
// Modify status of an existing condition
|
// Modify status of an existing condition
|
||||||
cn.Status = tsapi.ConnectorStatus{
|
cn.Status = tsapi.ConnectorStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{
|
Conditions: []metav1.Condition{
|
||||||
{
|
{
|
||||||
Type: tsapi.ConnectorReady,
|
Type: string(tsapi.ConnectorReady),
|
||||||
Status: metav1.ConditionFalse,
|
Status: metav1.ConditionFalse,
|
||||||
Reason: "someReason",
|
Reason: "someReason",
|
||||||
Message: "someMsg",
|
Message: "someMsg",
|
||||||
ObservedGeneration: 1,
|
ObservedGeneration: 1,
|
||||||
LastTransitionTime: &fakePast,
|
LastTransitionTime: fakePast,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "anotherReason", "anotherMsg", 2, clock, zl.Sugar())
|
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "anotherReason", "anotherMsg", 2, clock, zl.Sugar())
|
||||||
assert.Equal(t, cn, tsapi.Connector{
|
assert.Equal(t, cn, tsapi.Connector{
|
||||||
Status: tsapi.ConnectorStatus{
|
Status: tsapi.ConnectorStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{
|
Conditions: []metav1.Condition{
|
||||||
{
|
{
|
||||||
Type: tsapi.ConnectorReady,
|
Type: string(tsapi.ConnectorReady),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: "anotherReason",
|
Reason: "anotherReason",
|
||||||
Message: "anotherMsg",
|
Message: "anotherMsg",
|
||||||
ObservedGeneration: 2,
|
ObservedGeneration: 2,
|
||||||
LastTransitionTime: &fakeNow,
|
LastTransitionTime: fakeNow,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -72,28 +72,28 @@ func TestSetConnectorCondition(t *testing.T) {
|
|||||||
|
|
||||||
// Don't modify last transition time if status hasn't changed
|
// Don't modify last transition time if status hasn't changed
|
||||||
cn.Status = tsapi.ConnectorStatus{
|
cn.Status = tsapi.ConnectorStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{
|
Conditions: []metav1.Condition{
|
||||||
{
|
{
|
||||||
Type: tsapi.ConnectorReady,
|
Type: string(tsapi.ConnectorReady),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: "someReason",
|
Reason: "someReason",
|
||||||
Message: "someMsg",
|
Message: "someMsg",
|
||||||
ObservedGeneration: 1,
|
ObservedGeneration: 1,
|
||||||
LastTransitionTime: &fakePast,
|
LastTransitionTime: fakePast,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "anotherReason", "anotherMsg", 2, clock, zl.Sugar())
|
SetConnectorCondition(&cn, tsapi.ConnectorReady, metav1.ConditionTrue, "anotherReason", "anotherMsg", 2, clock, zl.Sugar())
|
||||||
assert.Equal(t, cn, tsapi.Connector{
|
assert.Equal(t, cn, tsapi.Connector{
|
||||||
Status: tsapi.ConnectorStatus{
|
Status: tsapi.ConnectorStatus{
|
||||||
Conditions: []tsapi.ConnectorCondition{
|
Conditions: []metav1.Condition{
|
||||||
{
|
{
|
||||||
Type: tsapi.ConnectorReady,
|
Type: string(tsapi.ConnectorReady),
|
||||||
Status: metav1.ConditionTrue,
|
Status: metav1.ConditionTrue,
|
||||||
Reason: "anotherReason",
|
Reason: "anotherReason",
|
||||||
Message: "anotherMsg",
|
Message: "anotherMsg",
|
||||||
ObservedGeneration: 2,
|
ObservedGeneration: 2,
|
||||||
LastTransitionTime: &fakePast,
|
LastTransitionTime: fakePast,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user