fix: migrate tailscale-operator to OAuth auth mode

Reviewed-on: #38

deployments/tailscale-operator/deployment.yaml

@@ -17,29 +17,29 @@ spec:
     spec:
       serviceAccountName: tailscale-operator
       containers:
-        - name: operator
-          image: ghcr.io/tailscale/k8s-operator:v1.78.0
-          env:
-            - name: TS_AUTHKEY
-              valueFrom:
-                secretKeyRef:
-                  name: tailscale-auth
-                  key: TS_AUTH_KEY
-            - name: DEPLOYMENT_TYPE
-              value: "k8s"
-          ports:
-            - containerPort: 8080
-              name: http-metrics
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: http-metrics
-            initialDelaySeconds: 10
-            periodSeconds: 15
-          resources:
-            requests:
-              cpu: 50m
-              memory: 64Mi
-            limits:
-              cpu: 200m
-              memory: 256Mi
+      - name: operator
+        image: ghcr.io/tailscale/k8s-operator:v1.78.3
+        imagePullPolicy: IfNotPresent
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: TS_CLIENT_ID_FILE
+          value: /etc/tailscale/oauth/client-id
+        - name: TS_CLIENT_SECRET_FILE
+          value: /etc/tailscale/oauth/client-secret
+        volumeMounts:
+        - name: oauth-secret
+          mountPath: /etc/tailscale/oauth/
+          readOnly: true
+        resources: {}
+        terminationGracePeriodSeconds: 30
+      volumes:
+      - name: oauth-secret
+        secret:
+          secretName: tailscale-operator-secret

deployments/tailscale-operator/namespace.yaml

@@ -0,0 +1,49 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: tailscale
+  labels:
+    app.kubernetes.io/name: tailscale-operator
+    app.kubernetes.io/part-of: infrastructure
+    management: gitops
+    managed-by: orion
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tailscale-operator
+  namespace: tailscale
+  labels:
+    app.kubernetes.io/name: tailscale-operator
+    app.kubernetes.io/part-of: infrastructure
+    management: gitops
+    managed-by: orion
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: tailscale-operator
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: tailscale-operator
+    spec:
+      serviceAccountName: tailscale-operator
+      containers:
+        - name: operator
+          image: ghcr.io/tailscale/k8s-operator:1.78.1
+          env:
+            - name: TS_AUTH_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: tailscale-auth
+                  key: TS_AUTH_KEY
+            - name: TS_USERSPACE
+              value: "true"
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 128Mi

deployments/tailscale-operator/rbac.yaml

@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tailscale-operator
-  namespace: tailscale
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: tailscale-operator
-rules:
-  - apiGroups: [""]
-    resources: ["secrets", "services", "endpoints", "namespaces", "nodes"]
-    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-  - apiGroups: ["apps"]
-    resources: ["deployments", "statefulsets", "daemonsets"]
-    verbs: ["get", "list", "watch", "update", "patch"]
-  - apiGroups: ["tailscale.com"]
-    resources: ["*"]
-    verbs: ["*"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: tailscale-operator
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: tailscale-operator
-subjects:
-  - kind: ServiceAccount
-    name: tailscale-operator
-    namespace: tailscale

deployments/tailscale/cluster-secret-store.yaml

@@ -1,14 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ClusterSecretStore
-metadata:
-  name: orion-vault
-  namespace: vault
-spec:
-  provider:
-    vault:
-      server: "http://vault.vault.svc.cluster.local:8200"
-      path: "secret"
-      auth:
-        agentAuth:
-          path: "kubernetes"
-      namespace: "vault"

deployments/tailscale/clusterrole.yaml

@@ -1,19 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: tailscale-operator
-  labels:
-    app: tailscale-operator
-rules:
-- apiGroups: [""]
-  resources: ["pods", "services", "secrets", "configmaps"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-- apiGroups: ["apps"]
-  resources: ["deployments", "statefulsets"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-- apiGroups: ["discovery.k8s.io"]
-  resources: ["endpointslices"]
-  verbs: ["get", "list", "watch"]
-- apiGroups: ["coordination.k8s.io"]
-  resources: ["leases"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]

deployments/tailscale/clusterrolebinding.yaml

@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: tailscale-operator
-  labels:
-    app: tailscale-operator
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: tailscale-operator
-subjects:
-- kind: ServiceAccount
-  name: tailscale-operator
-  namespace: apps

deployments/tailscale/configmap.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tailscale-operator
-  namespace: apps
-  labels:
-    app: tailscale-operator
-data:
-  TS_KUBE_OBJECT_STORE: "true"

deployments/tailscale/external-secret.yaml

@@ -1,4 +1,4 @@
-apiVersion: external-secrets.io/v1
+apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: tailscale-auth
@@ -12,7 +12,7 @@ spec:
     name: tailscale-auth
     creationPolicy: Owner
   data:
-  - secretKey: TS_AUTH_KEY
-    remoteRef:
-      key: tailscale
-      property: TS_AUTH_KEY
+    - secretKey: TS_AUTH_KEY
+      remoteRef:
+        key: Talos Cluster/tailscale
+        property: TS_AUTH_KEY

deployments/tailscale/external-secrets/tailscale-auth.yaml

@@ -1,18 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: tailscale-operator
-  namespace: tailscale
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: orion-vault
-    kind: ClusterSecretStore
-  target:
-    name: tailscale-operator
-    creationPolicy: Owner
-  data:
-    - secretKey: auth-key
-      remoteRef:
-        key: secret/Talos Cluster/tailscale
-        property: TS_AUTH_KEY

deployments/tailscale/namespace.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: apps
-  labels:
-    name: apps

deployments/tailscale/operator/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: tailscale-operator
   namespace: tailscale
   labels:
-    app.kubernetes.io/name: tailscale-operator
+    app: tailscale-operator
 spec:
   replicas: 1
   selector:
@@ -18,40 +18,27 @@ spec:
       serviceAccountName: tailscale-operator
       containers:
       - name: operator
-        image: ghcr.io/tailscale/kubernetes-operator:latest
+        image: ghcr.io/tailscale/k8s-operator:v1.78.3
         env:
         - name: POD_NAME
           valueFrom:
             fieldRef:
+              apiVersion: v1
               fieldPath: metadata.name
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
+              apiVersion: v1
               fieldPath: metadata.namespace
-        - name: TAILSCALE_AUTH_KEY
-          valueFrom:
-            secretKeyRef:
-              name: tailscale-operator
-              key: auth-key
-        ports:
-        - name: http
-          containerPort: 8080
-        resources:
-          requests:
-            cpu: 100m
-            memory: 128Mi
-          limits:
-            cpu: 250m
-            memory: 256Mi
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-          initialDelaySeconds: 10
-          periodSeconds: 30
+        - name: TS_CLIENT_ID_FILE
+          value: /etc/tailscale/oauth/client-id
+        - name: TS_CLIENT_SECRET_FILE
+          value: /etc/tailscale/oauth/client-secret
+        volumeMounts:
+        - name: oauth-secret
+          mountPath: /etc/tailscale/oauth
+          readOnly: true
+      volumes:
+      - name: oauth-secret
+        secret:
+          secretName: tailscale-operator-secret

deployments/tailscale/operator/rbac.yaml

@@ -1,39 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tailscale-operator
-  namespace: tailscale
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: tailscale-operator
-rules:
-- apiGroups: [""]
-  resources: ["secrets", "configmaps"]
-  verbs: ["create", "delete", "get", "list", "patch", "update", "watch", "patch", "list"]
-- apiGroups: [""]
-  resources: ["pods", "services"]
-  verbs: ["create", "delete", "get", "list", "patch", "update", "watch", "patch", "list"]
-- apiGroups: ["apps"]
-  resources: ["deployments", "daemonsets"]
-  verbs: ["create", "delete", "get", "list", "patch", "update", "watch", "patch", "list"]
-- apiGroups: ["operator.tailscale.com"]
-  resources: ["*"]
-  verbs: ["create", "delete", "get", "list", "patch", "update", "watch", "patch", "list"]
-- apiGroups: ["coordination.k8s.io"]
-  resources: ["leases"]
-  verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: tailscale-operator
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: tailscale-operator
-subjects:
-- kind: ServiceAccount
-  name: tailscale-operator
-  namespace: tailscale

deployments/tailscale/serviceaccount.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tailscale-operator
-  namespace: apps
-  labels:
-    app: tailscale-operator

deployments/tailscale/tailscale-operator/deployment.yaml

@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tailscale-operator
+  namespace: tailscale
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: tailscale-operator
+  template:
+    metadata:
+      labels:
+        app: tailscale-operator
+    spec:
+      containers:
+      - name: operator
+        image: ghcr.io/tailscale/k8s-operator:latest
+        env:
+        - name: TS_K8S_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: TS_K8S_SECRET
+          value: tailscale-operator-secret
+        - name: TS_CLIENT_ID_FILE
+          value: /etc/tailscale/oauth/client-id
+        - name: TS_CLIENT_SECRET_FILE
+          value: /etc/tailscale/oauth/client-secret
+        volumeMounts:
+        - name: oauth-secret
+          mountPath: /etc/tailscale/oauth
+          readOnly: true
+      volumes:
+      - name: oauth-secret
+        secret:
+          secretName: tailscale-operator-secret

tailscale/deployment.yaml

@@ -0,0 +1,43 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tailscale-operator
+  namespace: tailscale
+  labels:
+    app: tailscale-operator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: tailscale-operator
+  template:
+    metadata:
+      labels:
+        app: tailscale-operator
+    spec:
+      serviceAccountName: tailscale-operator
+      containers:
+        - name: operator
+          image: ghcr.io/tailscale/k8s-operator:v1.78.3
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: CLIENT_ID_FILE
+              value: /etc/tailscale/operator/client-id
+            - name: CLIENT_SECRET_FILE
+              value: /etc/tailscale/operator/client-secret
+          volumeMounts:
+            - name: operator-secret
+              mountPath: /etc/tailscale/operator
+              readOnly: true
+          resources: {}
+      volumes:
+        - name: operator-secret
+          secret:
+            secretName: tailscale-operator-secret

tailscale/operator/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: tailscale-operator
-  namespace: apps
+  namespace: tailscale
   labels:
     app: tailscale-operator
 spec:
@@ -18,13 +18,8 @@ spec:
       serviceAccountName: tailscale-operator
       containers:
       - name: operator
-        image: ghcr.io/tailscale/k8s-operator:1.72.0
+        image: ghcr.io/tailscale/k8s-operator:v1.78.3
         env:
-        - name: TS_AUTH_KEY
-          valueFrom:
-            secretKeyRef:
-              name: tailscale-auth
-              key: TS_AUTH_KEY
         - name: POD_NAME
           valueFrom:
             fieldRef:
@@ -33,10 +28,15 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        resources:
-          requests:
-            cpu: 50m
-            memory: 64Mi
-          limits:
-            cpu: 100m
-            memory: 128Mi
+        - name: TS_CLIENT_ID_FILE
+          value: /etc/tailscale/oauth/client-id
+        - name: TS_CLIENT_SECRET_FILE
+          value: /etc/tailscale/oauth/client-secret
+        volumeMounts:
+        - name: oauth-secret
+          mountPath: /etc/tailscale/oauth
+          readOnly: true
+      volumes:
+      - name: oauth-secret
+        secret:
+          secretName: tailscale-operator-secret

tailscale/tailscale-operator/deployment.yaml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tailscale-operator
+  namespace: tailscale
+  labels:
+    app: tailscale-operator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: tailscale-operator
+  template:
+    metadata:
+      labels:
+        app: tailscale-operator
+    spec:
+      serviceAccountName: tailscale-operator
+      containers:
+      - name: operator
+        image: ghcr.io/tailscale/k8s-operator:v1.78.3
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: TS_CLIENT_ID_FILE
+          value: /etc/tailscale/oauth/client-id
+        - name: TS_CLIENT_SECRET_FILE
+          value: /etc/tailscale/oauth/client-secret
+        volumeMounts:
+        - name: oauth-secret
+          mountPath: /etc/tailscale/oauth
+          readOnly: true
+      volumes:
+      - name: oauth-secret
+        secret:
+          secretName: tailscale-operator-secret