add back cluster and service cidr

Signed-off-by: Brian Downs <brian.downs@gmail.com>

.cr.yaml

@@ -1 +0,0 @@
-release-name-template: chart-{{ .Version }}

.drone.yml

@@ -0,0 +1,137 @@
+---
+kind: pipeline
+name: amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: rancher/dapper:v0.5.0
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  commands:
+  - dapper ci
+  - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    branch:
+      exclude:
+      - k3k-chart
+
+- name: package-chart
+  image: rancher/dapper:v0.5.0
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  commands:
+  - dapper package-chart
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    branch:
+    - k3k-chart
+    instance:
+    - drone-publish.rancher.io
+
+- name: release-chart
+  image: rancher/dapper:v0.5.0
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  commands:
+  - dapper release-chart
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    branch:
+    - k3k-chart
+    instance:
+    - drone-publish.rancher.io
+
+- name: github_binary_release
+  image: ibuildthecloud/github-release:v0.0.1
+  settings:
+    api_key:
+      from_secret: github_token
+    prerelease: true
+    checksum:
+    - sha256
+    checksum_file: CHECKSUMsum-amd64.txt
+    checksum_flatten: true
+    files:
+    - "bin/*"
+  when:
+    instance:
+    - drone-publish.rancher.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
+    branch:
+      exclude:
+      - k3k-chart
+
+- name: docker-publish
+  image: plugins/docker
+  settings:
+    dockerfile: package/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: "rancher/k3k"
+    username:
+      from_secret: docker_username
+  when:
+    instance:
+    - drone-publish.rancher.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
+    branch:
+      exclude:
+      - k3k-chart
+
+volumes:
+- name: docker
+  host:
+    path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: manifest
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: push-runtime-manifest
+    image: plugins/manifest
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      spec: manifest-runtime.tmpl
+    when:
+      event:
+        - tag
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        - refs/head/master
+        - refs/tags/*
+      branch:
+        exclude:
+        - k3k-chart
+depends_on:
+  - amd64

.github/workflows/build.yml

@@ -1,34 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-permissions:
-    contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-
-    - name: Run GoReleaser
-      uses: goreleaser/goreleaser-action@v6
-      with:
-        distribution: goreleaser
-        version: v2
-        args: --clean --snapshot
-      env:
-        REPO: ${{ github.repository }}
-        REGISTRY:
-        

.github/workflows/chart.yml

@@ -1,45 +0,0 @@
-name: Chart
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-    - "chart-*"
-
-permissions:
-    contents: write
-
-jobs:
-  chart-release:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-          fetch-depth: 0
-
-    - name: Check tag
-      if: github.event_name == 'push'
-      run: |
-        pushed_tag=$(echo ${{ github.ref_name }} | sed "s/chart-//")
-        chart_tag=$(yq .version charts/k3k/Chart.yaml)
-        
-        echo pushed_tag=${pushed_tag} chart_tag=${chart_tag}
-        [ "${pushed_tag}" == "${chart_tag}" ]
-
-    - name: Configure Git
-      run: |
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-    
-    - name: Install Helm
-      uses: azure/setup-helm@v4
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-    - name: Run chart-releaser
-      uses: helm/chart-releaser-action@v1.6.0
-      with:
-        config: .cr.yaml
-      env:
-        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/release-delete.yml

@@ -1,61 +0,0 @@
-name: Release - Delete Draft
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        type: string
-        description: The tag of the release
-
-permissions:
-    contents: write
-    packages: write
-
-env:
-  GH_TOKEN: ${{ github.token }}
-
-jobs:
-  release-delete:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check tag
-      if: inputs.tag == ''
-      run: echo "::error::Missing tag from input" && exit 1
-    
-    - name: Checkout code
-      uses: actions/checkout@v4
-    
-    - name: Check if release is draft
-      run: |
-        CURRENT_TAG=${{ inputs.tag }}
-        isDraft=$(gh release view ${CURRENT_TAG} --json isDraft --jq ".isDraft")
-        if [ "$isDraft" = true ]; then
-          echo "Release ${CURRENT_TAG} is draft"
-        else
-          echo "::error::Cannot delete non-draft release" && exit 1
-        fi
-
-    - name: Delete packages from Github Container Registry
-      run: |
-        CURRENT_TAG=${{ inputs.tag }}
-        echo "Deleting packages with tag ${CURRENT_TAG}"
-
-        JQ_QUERY=".[] | select(.metadata.container.tags[] == \"${CURRENT_TAG}\")"
-
-        for package in k3k k3k-kubelet
-        do
-          echo "Deleting ${package} image"
-          PACKAGE_TO_DELETE=$(gh api /user/packages/container/${package}/versions --jq "${JQ_QUERY}")
-          echo $PACKAGE_TO_DELETE | jq
-
-          PACKAGE_ID=$(echo $PACKAGE_TO_DELETE | jq .id)
-          echo "Deleting ${PACKAGE_ID}"
-          gh api --method DELETE /user/packages/container/${package}/versions/${PACKAGE_ID}  
-        done
-
-    - name: Delete Github release
-      run: |
-        CURRENT_TAG=${{ inputs.tag }}
-        echo "Deleting release ${CURRENT_TAG}"
-        gh release delete ${CURRENT_TAG}

.github/workflows/release.yml

@@ -1,87 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-    - "v*"
-  workflow_dispatch:
-    inputs:
-      commit:
-        type: string
-        description: Checkout a specific commit
-
-permissions:
-    contents: write
-    packages: write
-    id-token: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-    
-    - name: Checkout code at the specific commit
-      if: inputs.commit != ''
-      run: git checkout ${{ inputs.commit }}
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-
-    - name: "Read secrets"
-      uses: rancher-eio/read-vault-secrets@main
-      if: github.repository_owner == 'rancher'
-      with:
-        secrets: |
-          secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials username | DOCKER_USERNAME ;
-          secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials password | DOCKER_PASSWORD ;
-
-    # Manually dispatched workflows (or forks) will use ghcr.io
-    - name: Setup ghcr.io
-      if: github.event_name == 'workflow_dispatch' || github.repository_owner != 'rancher'
-      run: |
-        echo "REGISTRY=ghcr.io"                     >> $GITHUB_ENV
-        echo "DOCKER_USERNAME=${{ github.actor }}"  >> $GITHUB_ENV
-        echo "DOCKER_PASSWORD=${{ github.token }}"  >> $GITHUB_ENV
-
-    - name: Login to container registry
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ env.DOCKER_USERNAME }}
-        password: ${{ env.DOCKER_PASSWORD }}
-    
-    # If the tag does not exists the workflow was manually triggered.
-    # That means we are creating temporary nightly builds, with a "fake" local tag
-    - name: Check release tag
-      id: release-tag
-      run: |
-        CURRENT_TAG=$(git describe --tag --always --match="v[0-9]*")
-
-        if git show-ref --tags ${CURRENT_TAG} --quiet; then
-          echo "tag ${CURRENT_TAG} already exists";
-        else
-          echo "tag ${CURRENT_TAG} does not exist"
-          git tag ${CURRENT_TAG}
-        fi
-
-        echo "CURRENT_TAG=${CURRENT_TAG}" >> "$GITHUB_OUTPUT"
-
-    - name: Run GoReleaser
-      uses: goreleaser/goreleaser-action@v6
-      with:
-        distribution: goreleaser
-        version: v2
-        args: --clean
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-        GORELEASER_CURRENT_TAG: ${{ steps.release-tag.outputs.CURRENT_TAG }}
-        REGISTRY: ${{ env.REGISTRY }}
-        REPO: ${{ github.repository }}

.github/workflows/test.yaml

@@ -1,108 +0,0 @@
-name: Tests
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-
-permissions:
-    contents: read
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
-      with:
-        args: --timeout=5m
-        version: v1.60
-
-  tests:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-    
-    - name: Check go modules
-      run: |
-        go mod tidy
-
-        git --no-pager diff go.mod go.sum
-        test -z "$(git status --porcelain)"
-
-    - name: Install tools
-      run: |
-        go install github.com/onsi/ginkgo/v2/ginkgo
-        go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
-
-        ENVTEST_BIN=$(setup-envtest use -p path)
-        sudo mkdir -p /usr/local/kubebuilder/bin
-        sudo cp $ENVTEST_BIN/* /usr/local/kubebuilder/bin
-
-    - name: Run tests
-      run: ginkgo -v -r --skip-file=tests
-  
-  tests-e2e:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-    
-    - name: Check go modules
-      run: |
-        go mod tidy
-
-        git --no-pager diff go.mod go.sum
-        test -z "$(git status --porcelain)"
-
-    - name: Install Ginkgo
-      run: go install github.com/onsi/ginkgo/v2/ginkgo
-    
-    - name: Build
-      run: |
-        ./scripts/build
-
-        # add k3kcli to $PATH
-        echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
-
-    - name: Check k3kcli
-      run: k3kcli -v
-
-    - name: Run tests
-      run: ginkgo -v ./tests
-
-    - name: Archive k3s logs
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: k3s-logs
-        path: /tmp/k3s.log
-    
-    - name: Archive k3k logs
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: k3k-logs
-        path: /tmp/k3k.log

.gitignore

@@ -4,6 +4,4 @@
 /dist
 *.swp
 .idea
-.vscode/
-__debug*
-*-kubeconfig.yaml
+

.golangci.yml

@@ -1,12 +0,0 @@
-linters:
-  enable:
-  # default linters
-  - errcheck
-  - gosimple
-  - govet
-  - ineffassign
-  - staticcheck
-  - unused
-
-  # extra
-  - misspell

.goreleaser.yaml

@@ -1,99 +0,0 @@
-version: 2
-
-release:
-  draft: true
-  replace_existing_draft: true
-  prerelease: auto
-
-before:
-  hooks:
-    - go mod tidy
-    - go generate ./...
-
-builds:
-  - id: k3k
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-    goarch:
-      - "amd64"
-      - "arm64"
-      - "s390x"
-    ldflags:
-      - -w -s # strip debug info and symbol table
-      - -X "github.com/rancher/k3k/pkg/buildinfo.Version={{ .Tag }}"
-
-  - id: k3k-kubelet
-    main: ./k3k-kubelet
-    binary: k3k-kubelet
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-    goarch:
-      - "amd64"
-      - "arm64"
-      - "s390x"
-    ldflags:
-      - -w -s # strip debug info and symbol table
-      - -X "github.com/rancher/k3k/pkg/buildinfo.Version={{ .Tag }}"
-
-  - id: k3kcli
-    main: ./cli
-    binary: k3kcli
-    env:
-      - CGO_ENABLED=0
-    goarch:
-      - "amd64"
-      - "arm64"
-    ldflags:
-      - -w -s # strip debug info and symbol table
-      - -X "github.com/rancher/k3k/pkg/buildinfo.Version={{ .Tag }}"
-
-archives:
-  - format: binary
-    name_template: >-
-      {{ .Binary }}-{{- .Os }}-{{ .Arch }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
-    format_overrides:
-      - goos: windows
-        format: zip
-
-# For the image_templates we are using the following expression to build images for the correct registry
-#    {{- if .Env.REGISTRY }}{{ .Env.REGISTRY }}/{{ end }}
-#
-# REGISTRY=        -> rancher/k3k:vX.Y.Z
-# REGISTRY=ghcr.io -> ghcr.io/rancher/k3k:latest:vX.Y.Z
-#
-dockers:
-  - id: k3k
-    use: docker
-    ids:
-      - k3k
-      - k3kcli
-    dockerfile: "package/Dockerfile"
-    skip_push: false
-    image_templates:
-      - "{{- if .Env.REGISTRY }}{{ .Env.REGISTRY }}/{{ end }}{{ .Env.REPO }}:{{ .Tag }}"
-    build_flag_templates:
-      - "--build-arg=BIN_K3K=k3k"
-      - "--build-arg=BIN_K3KCLI=k3kcli"
-
-  - id: k3k-kubelet
-    use: docker
-    ids:
-      - k3k-kubelet
-    dockerfile: "package/Dockerfile.kubelet"
-    skip_push: false
-    image_templates:
-      - "{{- if .Env.REGISTRY }}{{ .Env.REGISTRY }}/{{ end }}{{ .Env.REPO }}-kubelet:{{ .Tag }}"
-    build_flag_templates:
-      - "--build-arg=BIN_K3K_KUBELET=k3k-kubelet"
-
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"

Dockerfile.dapper

@@ -1,4 +1,4 @@
-ARG GOLANG=rancher/hardened-build-base:v1.23.4b1
+ARG GOLANG=rancher/hardened-build-base:v1.20.6b2
 FROM ${GOLANG}
 
 ARG DAPPER_HOST_ARCH
@@ -6,26 +6,16 @@ ENV ARCH $DAPPER_HOST_ARCH
 
 RUN apk -U add \bash git gcc musl-dev docker vim less file curl wget ca-certificates
 RUN if [ "${ARCH}" == "amd64" ]; then \
-        curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.0; \
+        curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \
     fi
 
 RUN curl -sL https://github.com/helm/chart-releaser/releases/download/v1.5.0/chart-releaser_1.5.0_linux_${ARCH}.tar.gz | tar -xz cr \
     && mv cr /bin/
 
-# Tool for CRD generation.
-ENV CONTROLLER_GEN_VERSION v0.14.0
-RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}
-
-# Tool to setup the envtest framework to run the controllers integration tests
-RUN go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && \
-    ENVTEST_BIN=$(setup-envtest use -p path) && \
-    mkdir -p /usr/local/kubebuilder/bin && \
-    cp $ENVTEST_BIN/* /usr/local/kubebuilder/bin
-
 ENV GO111MODULE on
-ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GITHUB_TOKEN SKIP_TESTS GIT_TAG
+ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GITHUB_TOKEN
 ENV DAPPER_SOURCE /go/src/github.com/rancher/k3k/
-ENV DAPPER_OUTPUT ./bin ./dist ./deploy ./charts
+ENV DAPPER_OUTPUT ./bin ./dist ./deploy
 ENV DAPPER_DOCKER_SOCKET true
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}

Makefile

@@ -1,4 +1,5 @@
 TARGETS := $(shell ls ops)
+
 .dapper:
 	@echo Downloading dapper
 	@curl -sL https://releases.rancher.com/dapper/latest/dapper-$$(uname -s)-$$(uname -m) > .dapper.tmp
@@ -11,4 +12,4 @@ $(TARGETS): .dapper
 
 .DEFAULT_GOAL := default
 
-.PHONY: $(TARGETS)
+.PHONY: $(TARGETS)

README.md

@@ -1,170 +1,58 @@
-# K3k: Kubernetes in Kubernetes
+# K3K
 
-[![Experimental](https://img.shields.io/badge/status-experimental-orange.svg)](https://shields.io/)
-[![Go Report Card](https://goreportcard.com/badge/github.com/rancher/k3k)](https://goreportcard.com/report/github.com/rancher/k3k)
-![Tests](https://github.com/rancher/k3k/actions/workflows/test.yaml/badge.svg)
-![Build](https://github.com/rancher/k3k/actions/workflows/build.yml/badge.svg)
+A Kubernetes in Kubernetes tool, k3k provides a way to run multiple embedded isolated k3s clusters on your kubernetes cluster.
 
+## Example
 
-K3k, Kubernetes in Kubernetes, is a tool that empowers you to create and manage isolated K3s clusters within your existing Kubernetes environment.  It enables efficient multi-tenancy, streamlined experimentation, and robust resource isolation, minimizing infrastructure costs by allowing you to run multiple lightweight Kubernetes clusters on the same physical host. K3k offers both "shared" mode, optimizing resource utilization, and "virtual" mode, providing complete isolation with dedicated K3s server pods. This allows you to access a full Kubernetes experience without the overhead of managing separate physical resources. 
-
-K3k integrates seamlessly with Rancher for simplified management of your embedded clusters.
-
-
-**Experimental Tool**
-
-This project is still under development and is considered experimental. It may have limitations, bugs, or changes. Please use with caution and report any issues you encounter. We appreciate your feedback as we continue to refine and improve this tool.
-
-
-## Features and Benefits
-
-- **Resource Isolation:** Ensure workload isolation and prevent resource contention between teams or applications. K3k allows you to define resource limits and quotas for each embedded cluster, guaranteeing that one team's workloads won't impact another's performance.
-
-- **Simplified Multi-Tenancy:** Easily create dedicated Kubernetes environments for different users or projects, simplifying access control and management. Provide each team with their own isolated cluster, complete with its own namespaces, RBAC, and resource quotas, without the complexity of managing multiple physical clusters.
-
-- **Lightweight and Fast:** Leverage the lightweight nature of K3s to spin up and tear down clusters quickly, accelerating development and testing cycles. Spin up a new K3k cluster in seconds, test your application in a clean environment, and tear it down just as quickly, streamlining your CI/CD pipeline.
-
-- **Optimized Resource Utilization (Shared Mode):** Maximize your infrastructure investment by running multiple K3s clusters on the same physical host. K3k's shared mode allows you to efficiently share underlying resources, reducing overhead and minimizing costs.
-
-- **Complete Isolation (Virtual Mode):** For enhanced security and isolation, K3k's virtual mode provides dedicated K3s server pods for each embedded cluster. This ensures complete separation of workloads and eliminates any potential resource contention or security risks.
-
-- **Rancher Integration:** Simplify the management of your K3k clusters with Rancher. Leverage Rancher's intuitive UI and powerful features to monitor, manage, and scale your embedded clusters with ease.
-
-
-## Installation
-
-This section provides instructions on how to install K3k and the `k3kcli`.
-
-
-### Prerequisites
-
-* [Helm](https://helm.sh) must be installed to use the charts. Please refer to Helm's [documentation](https://helm.sh/docs) to get started.
-
-
-### Install the K3k controller
-
-1. Add the K3k Helm repository:
-
-   ```bash
-   helm repo add k3k https://rancher.github.io/k3k
-   helm repo update
-   ```
-
-2. Install the K3k controller:
-
-   ```bash
-   helm install --namespace k3k-system --create-namespace k3k k3k/k3k --devel
-   ```
-
-**NOTE:** K3k is currently under development, so the chart is marked as a development chart. This means you need to add the `--devel` flag to install it.  For production use, keep an eye on releases for stable versions. We recommend using the latest released version when possible.
-
-
-### Install the `k3kcli`
-
-The `k3kcli` provides a quick and easy way to create K3k clusters and automatically exposes them via a kubeconfig.
-
-To install it, simply download the latest available version for your architecture from the GitHub Releases page.
-
-For example, you can download the Linux amd64 version with:
-
-```
-wget -qO k3kcli https://github.com/rancher/k3k/releases/download/v0.2.2-rc4/k3kcli-linux-amd64 && \
-  chmod +x k3kcli && \
-  sudo mv k3kcli /usr/local/bin
-```
-
-You should now be able to run:
-```bash
--> % k3kcli --version
-k3kcli Version: v0.2.2-rc4
-```
+An example on creating a k3k cluster on an RKE2 host using k3kcli
 
+[![asciicast](https://asciinema.org/a/eYlc3dsL2pfP2B50i3Ea8MJJp.svg)](https://asciinema.org/a/eYlc3dsL2pfP2B50i3Ea8MJJp)
 
 ## Usage
 
-This section provides examples of how to use the `k3kcli` to manage your K3k clusters.
+K3K consists of a controller and a cli tool, the controller can be deployed via a helm chart and the cli can be downloaded from the releases page.
 
-**K3k operates within the context of your currently configured `kubectl` context.** This means that K3k respects the standard Kubernetes mechanisms for context configuration, including the `--kubeconfig` flag, the `$KUBECONFIG` environment variable, and the default `$HOME/.kube/config` file. Any K3k clusters you create will reside within the Kubernetes cluster that your `kubectl` is currently pointing to.
+### Deploy Controller
 
+[Helm](https://helm.sh) must be installed to use the charts.  Please refer to
+Helm's [documentation](https://helm.sh/docs) to get started.
 
-### Creating a K3k Cluster
+Once Helm has been set up correctly, add the repo as follows:
 
-To create a new K3k cluster, use the following command:
-
-```bash
-k3kcli cluster create mycluster
+```sh
+  helm repo add k3k https://rancher.github.io/k3k
 ```
 
-When the K3s server is ready, `k3kcli` will generate the necessary kubeconfig file and print instructions on how to use it.  
+If you had already added this repo earlier, run `helm repo update` to retrieve
+the latest versions of the packages.  You can then run `helm search repo
+k3k --devel` to see the charts.
 
-Here's an example of the output:
+To install the k3k chart:
 
-```bash
-INFO[0000] Creating a new cluster [mycluster]          
-INFO[0000] Extracting Kubeconfig for [mycluster] cluster 
-INFO[0000] waiting for cluster to be available..        
-INFO[0073] certificate CN=system:admin,O=system:masters signed by CN=k3s-client-ca@1738746570: notBefore=2025-02-05 09:09:30 +0000 UTC notAfter=2026-02-05 09:10:42 +0000 UTC 
-INFO[0073] You can start using the cluster with: 
-
-        export KUBECONFIG=/my/current/directory/mycluster-kubeconfig.yaml
-        kubectl cluster-info  
+```sh
+helm install my-k3k k3k/k3k --devel
 ```
 
-After exporting the generated kubeconfig, you should be able to reach your Kubernetes cluster:
+To uninstall the chart:
 
-```bash
-export KUBECONFIG=/my/current/directory/mycluster-kubeconfig.yaml
-kubectl get nodes
-kubectl get pods -A
+```sh
+helm delete my-k3k
 ```
 
-You can also directly create a Cluster resource in some namespace, to create a K3k cluster:
+**NOTE: Since k3k is still under development, the chart is marked as a development chart, this means that you need to add the `--devel` flag to install it.**
 
-```bash
-kubectl apply -f - <<EOF
-apiVersion: k3k.io/v1alpha1
-kind: Cluster
-metadata:
-  name: mycluster
-  namespace: k3k-mycluster
-EOF
+### Create a new cluster
+
+To create a new cluster you need to install and run the cli or create a cluster object, to install the cli:
+
+```sh
+wget https://github.com/rancher/k3k/releases/download/v0.0.0-alpha6/k3kcli
+chmod +x k3kcli
+sudo cp k3kcli /usr/local/bin
 ```
 
-and use the `k3kcli` to retrieve the kubeconfig:
+To create a new cluster you can use:
 
-```bash
-k3kcli kubeconfig generate --namespace k3k-mycluster --name mycluster 
+```sh
+k3k cluster create --name example-cluster --token test
 ```
-
-
-### Deleting a K3k Cluster
-
-To delete a K3k cluster, use the following command:
-
-```bash
-k3kcli cluster delete mycluster
-```
-
-
-## Architecture
-
-For a detailed explanation of the K3k architecture, please refer to the [Architecture documentation](./docs/architecture.md).
-
-
-## Advanced Usage
-
-For more in-depth examples and information on advanced K3k usage, including details on shared vs. virtual modes, resource management, and other configuration options, please see the [Advanced Usage documentation](./docs/advanced-usage.md).
-
-
-## Development
-
-If you're interested in building K3k from source or contributing to the project, please refer to the [Development documentation](./docs/development.md).
-
-
-## License
-
-Copyright (c) 2014-2025 [SUSE](http://rancher.com/)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

charts/k3k/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: k3k
 description: A Helm chart for K3K
 type: application
-version: 0.1.6-r1
-appVersion: v0.2.2-rc5
+version: 0.1.0-r1
+appVersion: 0.0.0-alpha6

charts/k3k/crds/cluster.yaml

@@ -0,0 +1,102 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusters.k3k.io
+spec:
+  group: k3k.io
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                name:
+                  type: string
+                version:
+                  type: string
+                servers:
+                  type: integer
+                agents:
+                  type: integer
+                token:
+                  type: string
+                clusterCIDR:
+                  type: string
+                serviceCIDR:
+                  type: string
+                clusterDNS:
+                  type: string
+                serverArgs:
+                  type: array
+                  items:
+                    type: string
+                agentArgs:
+                  type: array
+                  items:
+                    type: string
+                tlsSANs:
+                  type: array
+                  items:
+                    type: string
+                persistence:
+                  type: object
+                  properties:
+                    type:
+                      type: string
+                      default: "ephermal"
+                    storageClassName:
+                      type: string
+                    storageRequestSize:
+                      type: string
+                addons:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      secretNamespace:
+                        type: string
+                      secretRef:
+                        type: string
+                expose:
+                  type: object
+                  properties:
+                    ingress:
+                      type: object
+                      properties:
+                        enabled: 
+                          type: boolean
+                        ingressClassName:
+                          type: string
+                    loadbalancer:
+                      type: object
+                      properties:
+                        enabled: 
+                          type: boolean
+                    nodePort:
+                      type: object
+                      properties:
+                        enabled: 
+                          type: boolean
+            status:
+              type: object
+              properties:
+                overrideClusterCIDR:
+                  type: boolean
+                clusterCIDR:
+                  type: string
+                overrideServiceCIDR:
+                  type: boolean
+                serviceCIDR:
+                  type: string
+                clusterDNS:
+                  type: string
+  scope: Cluster
+  names:
+    plural: clusters
+    singular: cluster
+    kind: Cluster

charts/k3k/crds/k3k.io_clusters.yaml

@@ -1,277 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
-  name: clusters.k3k.io
-spec:
-  group: k3k.io
-  names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
-    singular: cluster
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        properties:
-          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
-            type: string
-          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
-            type: string
-          metadata:
-            type: object
-          spec:
-            default: {}
-            properties:
-              addons:
-                description: Addons is a list of secrets containing raw YAML which
-                  will be deployed in the virtual K3k cluster on startup.
-                items:
-                  properties:
-                    secretNamespace:
-                      type: string
-                    secretRef:
-                      type: string
-                  type: object
-                type: array
-              agentArgs:
-                description: AgentArgs are the ordered key value pairs (e.x. "testArg",
-                  "testValue") for the K3s pods running in agent mode.
-                items:
-                  type: string
-                type: array
-              agents:
-                default: 0
-                description: Agents is the number of K3s pods to run in agent (worker)
-                  mode.
-                format: int32
-                type: integer
-                x-kubernetes-validations:
-                - message: invalid value for agents
-                  rule: self >= 0
-              clusterCIDR:
-                description: ClusterCIDR is the CIDR range for the pods of the cluster.
-                  Defaults to 10.42.0.0/16.
-                type: string
-                x-kubernetes-validations:
-                - message: clusterCIDR is immutable
-                  rule: self == oldSelf
-              clusterDNS:
-                description: |-
-                  ClusterDNS is the IP address for the coredns service. Needs to be in the range provided by ServiceCIDR or CoreDNS may not deploy.
-                  Defaults to 10.43.0.10.
-                type: string
-                x-kubernetes-validations:
-                - message: clusterDNS is immutable
-                  rule: self == oldSelf
-              clusterLimit:
-                description: Limit is the limits that apply for the server/worker
-                  nodes.
-                properties:
-                  serverLimit:
-                    additionalProperties:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                      x-kubernetes-int-or-string: true
-                    description: ServerLimit is the limits (cpu/mem) that apply to
-                      the server nodes
-                    type: object
-                  workerLimit:
-                    additionalProperties:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                      x-kubernetes-int-or-string: true
-                    description: WorkerLimit is the limits (cpu/mem) that apply to
-                      the agent nodes
-                    type: object
-                type: object
-              expose:
-                description: |-
-                  Expose contains options for exposing the apiserver inside/outside of the cluster. By default, this is only exposed as a
-                  clusterIP which is relatively secure, but difficult to access outside of the cluster.
-                properties:
-                  ingress:
-                    properties:
-                      annotations:
-                        additionalProperties:
-                          type: string
-                        description: Annotations is a key value map that will enrich
-                          the Ingress annotations
-                        type: object
-                      ingressClassName:
-                        type: string
-                    type: object
-                  loadbalancer:
-                    properties:
-                      enabled:
-                        type: boolean
-                    required:
-                    - enabled
-                    type: object
-                  nodePort:
-                    properties:
-                      etcdPort:
-                        description: |-
-                          ETCDPort is the port on each node on which the ETCD service is exposed when type is NodePort.
-                          If not specified, a port will be allocated (default: 30000-32767)
-                        format: int32
-                        type: integer
-                      serverPort:
-                        description: |-
-                          ServerPort is the port on each node on which the K3s server service is exposed when type is NodePort.
-                          If not specified, a port will be allocated (default: 30000-32767)
-                        format: int32
-                        type: integer
-                      servicePort:
-                        description: |-
-                          ServicePort is the port on each node on which the K3s service is exposed when type is NodePort.
-                          If not specified, a port will be allocated (default: 30000-32767)
-                        format: int32
-                        type: integer
-                    type: object
-                type: object
-              mode:
-                allOf:
-                - enum:
-                  - shared
-                  - virtual
-                - enum:
-                  - shared
-                  - virtual
-                default: shared
-                description: Mode is the cluster provisioning mode which can be either
-                  "shared" or "virtual". Defaults to "shared"
-                type: string
-                x-kubernetes-validations:
-                - message: mode is immutable
-                  rule: self == oldSelf
-              nodeSelector:
-                additionalProperties:
-                  type: string
-                description: |-
-                  NodeSelector is the node selector that will be applied to all server/agent pods.
-                  In "shared" mode the node selector will be applied also to the workloads.
-                type: object
-              persistence:
-                default:
-                  type: dynamic
-                description: |-
-                  Persistence contains options controlling how the etcd data of the virtual cluster is persisted. By default, no data
-                  persistence is guaranteed, so restart of a virtual cluster pod may result in data loss without this field.
-                properties:
-                  storageClassName:
-                    type: string
-                  storageRequestSize:
-                    type: string
-                  type:
-                    default: dynamic
-                    description: PersistenceMode is the storage mode of a Cluster.
-                    type: string
-                required:
-                - type
-                type: object
-              priorityClass:
-                description: |-
-                  PriorityClass is the priorityClassName that will be applied to all server/agent pods.
-                  In "shared" mode the priorityClassName will be applied also to the workloads.
-                type: string
-              serverArgs:
-                description: ServerArgs are the ordered key value pairs (e.x. "testArg",
-                  "testValue") for the K3s pods running in server mode.
-                items:
-                  type: string
-                type: array
-              servers:
-                default: 1
-                description: Servers is the number of K3s pods to run in server (controlplane)
-                  mode.
-                format: int32
-                type: integer
-                x-kubernetes-validations:
-                - message: cluster must have at least one server
-                  rule: self >= 1
-              serviceCIDR:
-                description: ServiceCIDR is the CIDR range for the services in the
-                  cluster. Defaults to 10.43.0.0/16.
-                type: string
-                x-kubernetes-validations:
-                - message: serviceCIDR is immutable
-                  rule: self == oldSelf
-              tlsSANs:
-                description: TLSSANs are the subjectAlternativeNames for the certificate
-                  the K3s server will use.
-                items:
-                  type: string
-                type: array
-              tokenSecretRef:
-                description: |-
-                  TokenSecretRef is Secret reference used as a token join server and worker nodes to the cluster. The controller
-                  assumes that the secret has a field "token" in its data, any other fields in the secret will be ignored.
-                properties:
-                  name:
-                    description: name is unique within a namespace to reference a
-                      secret resource.
-                    type: string
-                  namespace:
-                    description: namespace defines the space within which the secret
-                      name must be unique.
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
-              version:
-                description: Version is a string representing the Kubernetes version
-                  to be used by the virtual nodes.
-                type: string
-            type: object
-          status:
-            properties:
-              clusterCIDR:
-                type: string
-              clusterDNS:
-                type: string
-              hostVersion:
-                type: string
-              persistence:
-                properties:
-                  storageClassName:
-                    type: string
-                  storageRequestSize:
-                    type: string
-                  type:
-                    default: dynamic
-                    description: PersistenceMode is the storage mode of a Cluster.
-                    type: string
-                required:
-                - type
-                type: object
-              serviceCIDR:
-                type: string
-              tlsSANs:
-                items:
-                  type: string
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}

charts/k3k/crds/k3k.io_clustersets.yaml

@@ -1,210 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
-  name: clustersets.k3k.io
-spec:
-  group: k3k.io
-  names:
-    kind: ClusterSet
-    listKind: ClusterSetList
-    plural: clustersets
-    singular: clusterset
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        properties:
-          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
-            type: string
-          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
-            type: string
-          metadata:
-            type: object
-          spec:
-            default: {}
-            description: Spec is the spec of the ClusterSet
-            properties:
-              allowedNodeTypes:
-                default:
-                - shared
-                description: AllowedNodeTypes are the allowed cluster provisioning
-                  modes. Defaults to [shared].
-                items:
-                  description: ClusterMode is the possible provisioning mode of a
-                    Cluster.
-                  enum:
-                  - shared
-                  - virtual
-                  type: string
-                minItems: 1
-                type: array
-                x-kubernetes-validations:
-                - message: mode is immutable
-                  rule: self == oldSelf
-              defaultLimits:
-                description: DefaultLimits are the limits used for servers/agents
-                  when a cluster in the set doesn't provide any
-                properties:
-                  serverLimit:
-                    additionalProperties:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                      x-kubernetes-int-or-string: true
-                    description: ServerLimit is the limits (cpu/mem) that apply to
-                      the server nodes
-                    type: object
-                  workerLimit:
-                    additionalProperties:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                      x-kubernetes-int-or-string: true
-                    description: WorkerLimit is the limits (cpu/mem) that apply to
-                      the agent nodes
-                    type: object
-                type: object
-              defaultNodeSelector:
-                additionalProperties:
-                  type: string
-                description: DefaultNodeSelector is the node selector that applies
-                  to all clusters (server + agent) in the set
-                type: object
-              defaultPriorityClass:
-                description: DefaultPriorityClass is the priorityClassName applied
-                  to all pods of all clusters in the set
-                type: string
-              disableNetworkPolicy:
-                description: DisableNetworkPolicy is an option that will disable the
-                  creation of a default networkpolicy for cluster isolation
-                type: boolean
-              maxLimits:
-                additionalProperties:
-                  anyOf:
-                  - type: integer
-                  - type: string
-                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                  x-kubernetes-int-or-string: true
-                description: MaxLimits are the limits that apply to all clusters (server
-                  + agent) in the set
-                type: object
-              podSecurityAdmissionLevel:
-                description: PodSecurityAdmissionLevel is the policy level applied
-                  to the pods in the namespace.
-                enum:
-                - privileged
-                - baseline
-                - restricted
-                type: string
-            type: object
-          status:
-            description: Status is the status of the ClusterSet
-            properties:
-              conditions:
-                description: Conditions are the invidual conditions for the cluster
-                  set
-                items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
-                  properties:
-                    lastTransitionTime:
-                      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.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      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.
-                      format: int64
-                      minimum: 0
-                      type: integer
-                    reason:
-                      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.
-                      maxLength: 1024
-                      minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                      type: string
-                    status:
-                      description: status of the condition, one of True, False, Unknown.
-                      enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                      type: string
-                    type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
-                      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])$
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              lastUpdateTime:
-                description: LastUpdate is the timestamp when the status was last
-                  updated
-                type: string
-              observedGeneration:
-                description: ObservedGeneration was the generation at the time the
-                  status was updated.
-                format: int64
-                type: integer
-              summary:
-                description: Summary is a summary of the status
-                type: string
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}

charts/k3k/templates/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "k3k.fullname" . }}
   labels:
     {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   replicas: {{ .Values.image.replicaCount }}
   selector:
@@ -16,21 +16,11 @@ spec:
         {{- include "k3k.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-        - image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: {{ .Chart.Name }}
-          env:
-          - name: CLUSTER_CIDR
-            value: {{ .Values.host.clusterCIDR }}
-          - name: SHARED_AGENT_IMAGE
-            value: "{{ .Values.sharedAgent.image.repository }}:{{ default .Chart.AppVersion .Values.sharedAgent.image.tag }}"
-          - name: SHARED_AGENT_PULL_POLICY
-            value: {{ .Values.sharedAgent.image.pullPolicy }}
           ports:
           - containerPort: 8080
             name: https
             protocol: TCP
-          - containerPort: 9443
-            name: https-webhook
-            protocol: TCP
-      serviceAccountName: {{ include "k3k.serviceAccountName" . }}
+      serviceAccountName: {{ include "k3k.serviceAccountName" . }}

charts/k3k/templates/naemspace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.namespace }}

charts/k3k/templates/rbac.yaml

@@ -11,27 +11,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "k3k.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "k3k.fullname" . }}-node-proxy
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - "nodes"
-  - "nodes/proxy"
-  verbs:
-  - "get"
-  - "list"
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "k3k.fullname" . }}-node-proxy
-roleRef:
-  kind: ClusterRole
-  name: {{ include "k3k.fullname" . }}-node-proxy
-  apiGroup: rbac.authorization.k8s.io
+    namespace: {{ .Values.namespace }}

charts/k3k/templates/service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata: 
-  name: k3k-webhook
-  labels:
-    {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  ports:
-    - port: 443
-      protocol: TCP
-      name: https-webhook
-      targetPort: 9443
-  selector:
-    {{- include "k3k.selectorLabels" . | nindent 6 }}

charts/k3k/templates/serviceaccount.yaml

@@ -5,5 +5,5 @@ metadata:
   name: {{ include "k3k.serviceAccountName" . }}
   labels:
     {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
+  namespace: {{ .Values.namespace }}
+{{- end }}

charts/k3k/values.yaml

@@ -1,29 +1,19 @@
 replicaCount: 1
+namespace: k3k-system
 
 image:
-  repository: rancher/k3k
-  tag: ""
-  pullPolicy: ""
+  repository: briandowns/k3k
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "dev"
 
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-host:
-  # clusterCIDR specifies the clusterCIDR that will be added to the default networkpolicy for clustersets, if not set
-  # the controller will collect the PodCIDRs of all the nodes on the system.
-  clusterCIDR: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
-
-# configuration related to the shared agent mode in k3k
-sharedAgent:
-  image:
-    repository: "rancher/k3k-kubelet"
-    tag: ""
-    pullPolicy: ""

cli/cmds/cluster/cluster.go

@@ -1,16 +1,25 @@
 package cluster
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/rancher/k3k/cli/cmds"
+	"github.com/urfave/cli"
 )
 
-func NewCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "cluster",
-		Usage: "cluster command",
-		Subcommands: []*cli.Command{
-			NewCreateCmd(),
-			NewDeleteCmd(),
-		},
+var clusterSubcommands = []cli.Command{
+	{
+		Name:            "create",
+		Usage:           "Create new cluster",
+		SkipFlagParsing: false,
+		SkipArgReorder:  true,
+		Action:          createCluster,
+		Flags:           append(cmds.CommonFlags, clusterCreateFlags...),
+	},
+}
+
+func NewClusterCommand() cli.Command {
+	return cli.Command{
+		Name:        "cluster",
+		Usage:       "cluster command",
+		Subcommands: clusterSubcommands,
 	}
 }

cli/cmds/cluster/create.go

@@ -3,6 +3,7 @@ package cluster
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -11,194 +12,316 @@ import (
 
 	"github.com/rancher/k3k/cli/cmds"
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	k3kcluster "github.com/rancher/k3k/pkg/controller/cluster"
-	"github.com/rancher/k3k/pkg/controller/kubeconfig"
+	"github.com/rancher/k3k/pkg/controller/cluster"
+	"github.com/rancher/k3k/pkg/controller/util"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/client-go/util/retry"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var Scheme = runtime.NewScheme()
+var (
+	Scheme  = runtime.NewScheme()
+	backoff = wait.Backoff{
+		Steps:    5,
+		Duration: 3 * time.Second,
+		Factor:   2,
+		Jitter:   0.1,
+	}
+)
 
 func init() {
 	_ = clientgoscheme.AddToScheme(Scheme)
 	_ = v1alpha1.AddToScheme(Scheme)
 }
 
-type CreateConfig struct {
-	token                string
-	clusterCIDR          string
-	serviceCIDR          string
-	servers              int
-	agents               int
-	serverArgs           cli.StringSlice
-	agentArgs            cli.StringSlice
-	persistenceType      string
-	storageClassName     string
-	version              string
-	mode                 string
-	kubeconfigServerHost string
-}
+var (
+	name             string
+	token            string
+	clusterCIDR      string
+	serviceCIDR      string
+	servers          int64
+	agents           int64
+	serverArgs       cli.StringSlice
+	agentArgs        cli.StringSlice
+	persistenceType  string
+	storageClassName string
+	version          string
 
-func NewCreateCmd() *cli.Command {
-	createConfig := &CreateConfig{}
-	createFlags := NewCreateFlags(createConfig)
-
-	return &cli.Command{
-		Name:            "create",
-		Usage:           "Create new cluster",
-		UsageText:       "k3kcli cluster create [command options] NAME",
-		Action:          createAction(createConfig),
-		Flags:           append(cmds.CommonFlags, createFlags...),
-		HideHelpCommand: true,
+	clusterCreateFlags = []cli.Flag{
+		cli.StringFlag{
+			Name:        "name",
+			Usage:       "name of the cluster",
+			Destination: &name,
+		},
+		cli.Int64Flag{
+			Name:        "servers",
+			Usage:       "number of servers",
+			Destination: &servers,
+			Value:       1,
+		},
+		cli.Int64Flag{
+			Name:        "agents",
+			Usage:       "number of agents",
+			Destination: &agents,
+		},
+		cli.StringFlag{
+			Name:        "token",
+			Usage:       "token of the cluster",
+			Destination: &token,
+		},
+		cli.StringFlag{
+			Name:        "cluster-cidr",
+			Usage:       "cluster CIDR",
+			Destination: &clusterCIDR,
+		},
+		cli.StringFlag{
+			Name:        "service-cidr",
+			Usage:       "service CIDR",
+			Destination: &serviceCIDR,
+		},
+		cli.StringFlag{
+			Name:        "persistence-type",
+			Usage:       "Persistence mode for the nodes (ephermal, static, dynamic)",
+			Value:       cluster.EphermalNodesType,
+			Destination: &persistenceType,
+		},
+		cli.StringFlag{
+			Name:        "storage-class-name",
+			Usage:       "Storage class name for dynamic persistence type",
+			Destination: &storageClassName,
+		},
+		cli.StringSliceFlag{
+			Name:  "server-args",
+			Usage: "servers extra arguments",
+			Value: &serverArgs,
+		},
+		cli.StringSliceFlag{
+			Name:  "agent-args",
+			Usage: "agents extra arguments",
+			Value: &agentArgs,
+		},
+		cli.StringFlag{
+			Name:        "version",
+			Usage:       "k3s version",
+			Destination: &version,
+			Value:       "v1.26.1-k3s1",
+		},
 	}
-}
+)
 
-func createAction(config *CreateConfig) cli.ActionFunc {
-	return func(clx *cli.Context) error {
-		ctx := context.Background()
-
-		if clx.NArg() != 1 {
-			return cli.ShowSubcommandHelp(clx)
-		}
-
-		name := clx.Args().First()
-		if name == k3kcluster.ClusterInvalidName {
-			return errors.New("invalid cluster name")
-		}
-
-		restConfig, err := clientcmd.BuildConfigFromFlags("", cmds.Kubeconfig)
-		if err != nil {
-			return err
-		}
-
-		ctrlClient, err := client.New(restConfig, client.Options{
-			Scheme: Scheme,
-		})
-		if err != nil {
-			return err
-		}
-
-		if config.token != "" {
-			logrus.Infof("Creating cluster token secret")
-			obj := k3kcluster.TokenSecretObj(config.token, name, cmds.Namespace())
-			if err := ctrlClient.Create(ctx, &obj); err != nil {
-				return err
-			}
-		}
-
-		logrus.Infof("Creating a new cluster [%s]", name)
-
-		cluster := newCluster(name, cmds.Namespace(), config)
-
-		cluster.Spec.Expose = &v1alpha1.ExposeConfig{
-			NodePort: &v1alpha1.NodePortConfig{},
-		}
-
-		// add Host IP address as an extra TLS-SAN to expose the k3k cluster
-		url, err := url.Parse(restConfig.Host)
-		if err != nil {
-			return err
-		}
-		host := strings.Split(url.Host, ":")
-		if config.kubeconfigServerHost != "" {
-			host = []string{config.kubeconfigServerHost}
-		}
-		cluster.Spec.TLSSANs = []string{host[0]}
-
-		if err := ctrlClient.Create(ctx, cluster); err != nil {
-			if apierrors.IsAlreadyExists(err) {
-				logrus.Infof("Cluster [%s] already exists", name)
-			} else {
-				return err
-			}
-		}
-
-		logrus.Infof("Extracting Kubeconfig for [%s] cluster", name)
-
-		logrus.Infof("waiting for cluster to be available..")
-
-		// retry every 5s for at most 2m, or 25 times
-		availableBackoff := wait.Backoff{
-			Duration: 5 * time.Second,
-			Cap:      2 * time.Minute,
-			Steps:    25,
-		}
-
-		cfg := kubeconfig.New()
-
-		var kubeconfig *clientcmdapi.Config
-		if err := retry.OnError(availableBackoff, apierrors.IsNotFound, func() error {
-			kubeconfig, err = cfg.Extract(ctx, ctrlClient, cluster, host[0])
-			return err
-		}); err != nil {
-			return err
-		}
-
-		pwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		logrus.Infof(`You can start using the cluster with: 
-	
-		export KUBECONFIG=%s
-		kubectl cluster-info
-		`, filepath.Join(pwd, cluster.Name+"-kubeconfig.yaml"))
-
-		kubeconfigData, err := clientcmd.Write(*kubeconfig)
-		if err != nil {
-			return err
-		}
-
-		return os.WriteFile(cluster.Name+"-kubeconfig.yaml", kubeconfigData, 0644)
+func createCluster(clx *cli.Context) error {
+	ctx := context.Background()
+	if err := validateCreateFlags(clx); err != nil {
+		return err
 	}
+
+	restConfig, err := clientcmd.BuildConfigFromFlags("", cmds.Kubeconfig)
+	if err != nil {
+		return err
+	}
+
+	ctrlClient, err := client.New(restConfig, client.Options{
+		Scheme: Scheme,
+	})
+
+	if err != nil {
+		return err
+	}
+	logrus.Infof("Creating a new cluster [%s]", name)
+	cluster := newCluster(
+		name,
+		token,
+		int32(servers),
+		int32(agents),
+		clusterCIDR,
+		serviceCIDR,
+		serverArgs,
+		agentArgs,
+	)
+
+	cluster.Spec.Expose = &v1alpha1.ExposeConfig{
+		NodePort: &v1alpha1.NodePortConfig{
+			Enabled: true,
+		},
+	}
+
+	// add Host IP address as an extra TLS-SAN to expose the k3k cluster
+	url, err := url.Parse(restConfig.Host)
+	if err != nil {
+		return err
+	}
+	host := strings.Split(url.Host, ":")
+	cluster.Spec.TLSSANs = []string{host[0]}
+
+	if err := ctrlClient.Create(ctx, cluster); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			logrus.Infof("Cluster [%s] already exists", name)
+		} else {
+			return err
+		}
+	}
+
+	logrus.Infof("Extracting Kubeconfig for [%s] cluster", name)
+	var kubeconfig []byte
+	if err := retry.OnError(backoff, apierrors.IsNotFound, func() error {
+		kubeconfig, err = extractKubeconfig(ctx, ctrlClient, cluster, host[0])
+		if err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
+
+	pwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	logrus.Infof(`You can start using the cluster with: 
+
+	export KUBECONFIG=%s
+	kubectl cluster-info
+	`, filepath.Join(pwd, cluster.Name+"-kubeconfig.yaml"))
+
+	return os.WriteFile(cluster.Name+"-kubeconfig.yaml", kubeconfig, 0644)
 }
 
-func newCluster(name, namespace string, config *CreateConfig) *v1alpha1.Cluster {
-	cluster := &v1alpha1.Cluster{
+func validateCreateFlags(clx *cli.Context) error {
+	if persistenceType != cluster.EphermalNodesType &&
+		persistenceType != cluster.DynamicNodesType {
+		return errors.New("invalid persistence type")
+	}
+	if token == "" {
+		return errors.New("empty cluster token")
+	}
+	if name == "" {
+		return errors.New("empty cluster name")
+	}
+	if servers <= 0 {
+		return errors.New("invalid number of servers")
+	}
+	if cmds.Kubeconfig == "" && os.Getenv("KUBECONFIG") == "" {
+		return errors.New("empty kubeconfig")
+	}
+
+	return nil
+}
+
+func newCluster(name, token string, servers, agents int32, clusterCIDR, serviceCIDR string, serverArgs, agentArgs []string) *v1alpha1.Cluster {
+	return &v1alpha1.Cluster{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: namespace,
+			Name: name,
 		},
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Cluster",
 			APIVersion: "k3k.io/v1alpha1",
 		},
 		Spec: v1alpha1.ClusterSpec{
-			Servers:     ptr.To(int32(config.servers)),
-			Agents:      ptr.To(int32(config.agents)),
-			ClusterCIDR: config.clusterCIDR,
-			ServiceCIDR: config.serviceCIDR,
-			ServerArgs:  config.serverArgs.Value(),
-			AgentArgs:   config.agentArgs.Value(),
-			Version:     config.version,
-			Mode:        v1alpha1.ClusterMode(config.mode),
-			Persistence: v1alpha1.PersistenceConfig{
-				Type:             v1alpha1.PersistenceMode(config.persistenceType),
-				StorageClassName: ptr.To(config.storageClassName),
+			Name:        name,
+			Token:       token,
+			Servers:     &servers,
+			Agents:      &agents,
+			ClusterCIDR: clusterCIDR,
+			ServiceCIDR: serviceCIDR,
+			ServerArgs:  serverArgs,
+			AgentArgs:   agentArgs,
+			Version:     version,
+			Persistence: &v1alpha1.PersistenceConfig{
+				Type:             persistenceType,
+				StorageClassName: storageClassName,
 			},
 		},
 	}
-	if config.storageClassName == "" {
-		cluster.Spec.Persistence.StorageClassName = nil
-	}
-	if config.token != "" {
-		cluster.Spec.TokenSecretRef = &v1.SecretReference{
-			Name:      k3kcluster.TokenSecretName(name),
-			Namespace: namespace,
-		}
+}
+
+func extractKubeconfig(ctx context.Context, client client.Client, cluster *v1alpha1.Cluster, serverIP string) ([]byte, error) {
+	nn := types.NamespacedName{
+		Name:      cluster.Name + "-kubeconfig",
+		Namespace: util.ClusterNamespace(cluster),
 	}
 
-	return cluster
+	var kubeSecret v1.Secret
+	if err := client.Get(ctx, nn, &kubeSecret); err != nil {
+		return nil, err
+	}
+
+	kubeconfig := kubeSecret.Data["kubeconfig.yaml"]
+	if kubeconfig == nil {
+		return nil, errors.New("empty kubeconfig")
+	}
+
+	nn = types.NamespacedName{
+		Name:      "k3k-server-service",
+		Namespace: util.ClusterNamespace(cluster),
+	}
+
+	var k3kService v1.Service
+	if err := client.Get(ctx, nn, &k3kService); err != nil {
+		return nil, err
+	}
+
+	if k3kService.Spec.Type == v1.ServiceTypeNodePort {
+		nodePort := k3kService.Spec.Ports[0].NodePort
+
+		restConfig, err := clientcmd.RESTConfigFromKubeConfig(kubeconfig)
+		if err != nil {
+			return nil, err
+		}
+		hostURL := fmt.Sprintf("https://%s:%d", serverIP, nodePort)
+		restConfig.Host = hostURL
+
+		clientConfig := generateKubeconfigFromRest(restConfig)
+
+		b, err := clientcmd.Write(clientConfig)
+		if err != nil {
+			return nil, err
+		}
+		kubeconfig = b
+	}
+
+	return kubeconfig, nil
+}
+
+func generateKubeconfigFromRest(config *rest.Config) clientcmdapi.Config {
+	clusters := make(map[string]*clientcmdapi.Cluster)
+	clusters["default-cluster"] = &clientcmdapi.Cluster{
+		Server:                   config.Host,
+		CertificateAuthorityData: config.CAData,
+	}
+
+	contexts := make(map[string]*clientcmdapi.Context)
+	contexts["default-context"] = &clientcmdapi.Context{
+		Cluster:   "default-cluster",
+		Namespace: "default",
+		AuthInfo:  "default",
+	}
+
+	authinfos := make(map[string]*clientcmdapi.AuthInfo)
+	authinfos["default"] = &clientcmdapi.AuthInfo{
+		ClientCertificateData: config.CertData,
+		ClientKeyData:         config.KeyData,
+	}
+
+	clientConfig := clientcmdapi.Config{
+		Kind:           "Config",
+		APIVersion:     "v1",
+		Clusters:       clusters,
+		Contexts:       contexts,
+		CurrentContext: "default-context",
+		AuthInfos:      authinfos,
+	}
+
+	return clientConfig
 }

cli/cmds/cluster/create_flags.go

@@ -1,98 +0,0 @@
-package cluster
-
-import (
-	"errors"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/urfave/cli/v2"
-)
-
-func NewCreateFlags(config *CreateConfig) []cli.Flag {
-	return []cli.Flag{
-		&cli.IntFlag{
-			Name:        "servers",
-			Usage:       "number of servers",
-			Destination: &config.servers,
-			Value:       1,
-			Action: func(ctx *cli.Context, value int) error {
-				if value <= 0 {
-					return errors.New("invalid number of servers")
-				}
-				return nil
-			},
-		},
-		&cli.IntFlag{
-			Name:        "agents",
-			Usage:       "number of agents",
-			Destination: &config.agents,
-		},
-		&cli.StringFlag{
-			Name:        "token",
-			Usage:       "token of the cluster",
-			Destination: &config.token,
-		},
-		&cli.StringFlag{
-			Name:        "cluster-cidr",
-			Usage:       "cluster CIDR",
-			Destination: &config.clusterCIDR,
-		},
-		&cli.StringFlag{
-			Name:        "service-cidr",
-			Usage:       "service CIDR",
-			Destination: &config.serviceCIDR,
-		},
-		&cli.StringFlag{
-			Name:        "persistence-type",
-			Usage:       "persistence mode for the nodes (ephemeral, static, dynamic)",
-			Value:       string(v1alpha1.DynamicNodesType),
-			Destination: &config.persistenceType,
-			Action: func(ctx *cli.Context, value string) error {
-				switch v1alpha1.PersistenceMode(value) {
-				case v1alpha1.EphemeralNodeType, v1alpha1.DynamicNodesType:
-					return nil
-				default:
-					return errors.New(`persistence-type should be one of "ephemeral", "static" or "dynamic"`)
-				}
-			},
-		},
-		&cli.StringFlag{
-			Name:        "storage-class-name",
-			Usage:       "storage class name for dynamic persistence type",
-			Destination: &config.storageClassName,
-		},
-		&cli.StringSliceFlag{
-			Name:  "server-args",
-			Usage: "servers extra arguments",
-			Value: &config.serverArgs,
-		},
-		&cli.StringSliceFlag{
-			Name:  "agent-args",
-			Usage: "agents extra arguments",
-			Value: &config.agentArgs,
-		},
-		&cli.StringFlag{
-			Name:        "version",
-			Usage:       "k3s version",
-			Destination: &config.version,
-		},
-		&cli.StringFlag{
-			Name:        "mode",
-			Usage:       "k3k mode type",
-			Destination: &config.mode,
-			Value:       "shared",
-			Action: func(ctx *cli.Context, value string) error {
-				switch value {
-				case string(v1alpha1.VirtualClusterMode), string(v1alpha1.SharedClusterMode):
-					return nil
-				default:
-					return errors.New(`mode should be one of "shared" or "virtual"`)
-				}
-			},
-		},
-		&cli.StringFlag{
-			Name:        "kubeconfig-server",
-			Usage:       "override the kubeconfig server host",
-			Destination: &config.kubeconfigServerHost,
-		},
-	}
-}

cli/cmds/cluster/delete.go

@@ -1,61 +1 @@
 package cluster
-
-import (
-	"context"
-	"errors"
-
-	"github.com/rancher/k3k/cli/cmds"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	k3kcluster "github.com/rancher/k3k/pkg/controller/cluster"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/clientcmd"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func NewDeleteCmd() *cli.Command {
-	return &cli.Command{
-		Name:            "delete",
-		Usage:           "Delete an existing cluster",
-		UsageText:       "k3kcli cluster delete [command options] NAME",
-		Action:          delete,
-		Flags:           cmds.CommonFlags,
-		HideHelpCommand: true,
-	}
-}
-
-func delete(clx *cli.Context) error {
-	ctx := context.Background()
-
-	if clx.NArg() != 1 {
-		return cli.ShowSubcommandHelp(clx)
-	}
-
-	name := clx.Args().First()
-	if name == k3kcluster.ClusterInvalidName {
-		return errors.New("invalid cluster name")
-	}
-
-	restConfig, err := clientcmd.BuildConfigFromFlags("", cmds.Kubeconfig)
-	if err != nil {
-		return err
-	}
-
-	ctrlClient, err := client.New(restConfig, client.Options{
-		Scheme: Scheme,
-	})
-	if err != nil {
-		return err
-	}
-
-	logrus.Infof("deleting [%s] cluster", name)
-
-	cluster := v1alpha1.Cluster{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: cmds.Namespace(),
-		},
-	}
-	return ctrlClient.Delete(ctx, &cluster)
-}

cli/cmds/kubeconfig/kubeconfig.go

@@ -1,185 +0,0 @@
-package kubeconfig
-
-import (
-	"context"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/rancher/k3k/cli/cmds"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/certs"
-	"github.com/rancher/k3k/pkg/controller/kubeconfig"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apiserver/pkg/authentication/user"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/client-go/util/retry"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func init() {
-	_ = clientgoscheme.AddToScheme(Scheme)
-	_ = v1alpha1.AddToScheme(Scheme)
-}
-
-var (
-	Scheme                  = runtime.NewScheme()
-	name                    string
-	cn                      string
-	org                     cli.StringSlice
-	altNames                cli.StringSlice
-	expirationDays          int64
-	configName              string
-	kubeconfigServerHost    string
-	generateKubeconfigFlags = []cli.Flag{
-		&cli.StringFlag{
-			Name:        "name",
-			Usage:       "cluster name",
-			Destination: &name,
-		},
-		&cli.StringFlag{
-			Name:        "config-name",
-			Usage:       "the name of the generated kubeconfig file",
-			Destination: &configName,
-		},
-		&cli.StringFlag{
-			Name:        "cn",
-			Usage:       "Common name (CN) of the generated certificates for the kubeconfig",
-			Destination: &cn,
-			Value:       controller.AdminCommonName,
-		},
-		&cli.StringSliceFlag{
-			Name:  "org",
-			Usage: "Organization name (ORG) of the generated certificates for the kubeconfig",
-			Value: &org,
-		},
-		&cli.StringSliceFlag{
-			Name:  "altNames",
-			Usage: "altNames of the generated certificates for the kubeconfig",
-			Value: &altNames,
-		},
-		&cli.Int64Flag{
-			Name:        "expiration-days",
-			Usage:       "Expiration date of the certificates used for the kubeconfig",
-			Destination: &expirationDays,
-			Value:       356,
-		},
-		&cli.StringFlag{
-			Name:        "kubeconfig-server",
-			Usage:       "override the kubeconfig server host",
-			Destination: &kubeconfigServerHost,
-			Value:       "",
-		},
-	}
-)
-
-var subcommands = []*cli.Command{
-	{
-		Name:            "generate",
-		Usage:           "Generate kubeconfig for clusters",
-		SkipFlagParsing: false,
-		Action:          generate,
-		Flags:           append(cmds.CommonFlags, generateKubeconfigFlags...),
-	},
-}
-
-func NewCommand() *cli.Command {
-	return &cli.Command{
-		Name:        "kubeconfig",
-		Usage:       "Manage kubeconfig for clusters",
-		Subcommands: subcommands,
-	}
-}
-
-func generate(clx *cli.Context) error {
-	var cluster v1alpha1.Cluster
-	ctx := context.Background()
-
-	restConfig, err := clientcmd.BuildConfigFromFlags("", cmds.Kubeconfig)
-	if err != nil {
-		return err
-	}
-
-	ctrlClient, err := client.New(restConfig, client.Options{
-		Scheme: Scheme,
-	})
-	if err != nil {
-		return err
-	}
-	clusterKey := types.NamespacedName{
-		Name:      name,
-		Namespace: cmds.Namespace(),
-	}
-
-	if err := ctrlClient.Get(ctx, clusterKey, &cluster); err != nil {
-		return err
-	}
-
-	url, err := url.Parse(restConfig.Host)
-	if err != nil {
-		return err
-	}
-	host := strings.Split(url.Host, ":")
-	if kubeconfigServerHost != "" {
-		host = []string{kubeconfigServerHost}
-		err := altNames.Set(kubeconfigServerHost)
-		if err != nil {
-			return err
-		}
-	}
-
-	certAltNames := certs.AddSANs(altNames.Value())
-
-	orgs := org.Value()
-	if orgs == nil {
-		orgs = []string{user.SystemPrivilegedGroup}
-	}
-
-	cfg := kubeconfig.KubeConfig{
-		CN:         cn,
-		ORG:        orgs,
-		ExpiryDate: time.Hour * 24 * time.Duration(expirationDays),
-		AltNames:   certAltNames,
-	}
-
-	logrus.Infof("waiting for cluster to be available..")
-
-	var kubeconfig *clientcmdapi.Config
-	if err := retry.OnError(controller.Backoff, apierrors.IsNotFound, func() error {
-		kubeconfig, err = cfg.Extract(ctx, ctrlClient, &cluster, host[0])
-		return err
-	}); err != nil {
-		return err
-	}
-
-	pwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	if configName == "" {
-		configName = cluster.Name + "-kubeconfig.yaml"
-	}
-
-	logrus.Infof(`You can start using the cluster with: 
-
-	export KUBECONFIG=%s
-	kubectl cluster-info
-	`, filepath.Join(pwd, configName))
-
-	kubeconfigData, err := clientcmd.Write(*kubeconfig)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(configName, kubeconfigData, 0644)
-}

cli/cmds/root.go

@@ -1,32 +1,19 @@
 package cmds
 
 import (
-	"os"
-
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
-)
-
-const (
-	defaultNamespace = "default"
+	"github.com/urfave/cli"
 )
 
 var (
 	debug       bool
 	Kubeconfig  string
-	namespace   string
 	CommonFlags = []cli.Flag{
-		&cli.StringFlag{
+		cli.StringFlag{
 			Name:        "kubeconfig",
-			EnvVars:     []string{"KUBECONFIG"},
-			Usage:       "kubeconfig path",
+			EnvVar:      "KUBECONFIG",
+			Usage:       "Kubeconfig path",
 			Destination: &Kubeconfig,
-			Value:       os.Getenv("HOME") + "/.kube/config",
-		},
-		&cli.StringFlag{
-			Name:        "namespace",
-			Usage:       "namespace to create the k3k cluster in",
-			Destination: &namespace,
 		},
 	}
 )
@@ -36,11 +23,11 @@ func NewApp() *cli.App {
 	app.Name = "k3kcli"
 	app.Usage = "CLI for K3K"
 	app.Flags = []cli.Flag{
-		&cli.BoolFlag{
+		cli.BoolFlag{
 			Name:        "debug",
 			Usage:       "Turn on debug logs",
 			Destination: &debug,
-			EnvVars:     []string{"K3K_DEBUG"},
+			EnvVar:      "K3K_DEBUG",
 		},
 	}
 
@@ -53,10 +40,3 @@ func NewApp() *cli.App {
 
 	return app
 }
-
-func Namespace() string {
-	if namespace == "" {
-		return defaultNamespace
-	}
-	return namespace
-}

cli/main.go

@@ -1,28 +1,26 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/rancher/k3k/cli/cmds"
 	"github.com/rancher/k3k/cli/cmds/cluster"
-	"github.com/rancher/k3k/cli/cmds/kubeconfig"
-	"github.com/rancher/k3k/pkg/buildinfo"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli"
+)
+
+const (
+	program   = "k3k"
+	version   = "dev"
+	gitCommit = "HEAD"
 )
 
 func main() {
 	app := cmds.NewApp()
-	app.Version = buildinfo.Version
-	cli.VersionPrinter = func(cCtx *cli.Context) {
-		fmt.Println("k3kcli Version: " + buildinfo.Version)
-	}
-
-	app.Commands = []*cli.Command{
-		cluster.NewCommand(),
-		kubeconfig.NewCommand(),
+	app.Commands = []cli.Command{
+		cluster.NewClusterCommand(),
 	}
+	app.Version = version + " (" + gitCommit + ")"
 
 	if err := app.Run(os.Args); err != nil {
 		logrus.Fatal(err)

docs/advanced-usage.md

@@ -1,114 +0,0 @@
-# Advanced Usage
-
-This document provides advanced usage information for k3k, including detailed use cases and explanations of the `Cluster` resource fields for customization.
-
-## Customizing the Cluster Resource
-
-The `Cluster` resource provides a variety of fields for customizing the behavior of your virtual clusters. You can check the [CRD documentation](./crds/crd-docs.md) for the full specs.
-
-**Note:** Most of these customization options can also be configured using the `k3kcli` tool. Refer to the `k3kcli` documentation for more details.
-
-
-
-This example creates a "shared" mode K3k cluster with:
-
-- 3 servers
-- K3s version v1.31.3-k3s1
-- Custom network configuration 
-- Deployment on specific nodes with the `nodeSelector`
-- `kube-api` exposed using an ingress
-- Custom K3s `serverArgs`
-- ETCD data persisted using a `PVC`
-
-
-```yaml
-apiVersion: k3k.io/v1alpha1
-kind: Cluster
-metadata:
-  name: my-virtual-cluster
-  namespace: my-namespace
-spec:
-  mode: shared
-  version: v1.31.3-k3s1
-  servers: 3
-  tlsSANs:
-    - my-cluster.example.com
-  nodeSelector:
-    disktype: ssd
-  expose:
-    ingress:
-      ingressClassName: nginx
-      annotations:
-        nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-        nginx.ingress.kubernetes.io/backend-protocol: "true"
-        nginx.ingress.kubernetes.io/ssl-redirect: "HTTPS"
-  clusterCIDR: 10.42.0.0/16
-  serviceCIDR: 10.43.0.0/16
-  clusterDNS: 10.43.0.10
-  serverArgs:
-  - --tls-san=my-cluster.example.com
-  persistence:
-    type: dynamic
-    storageClassName: local-path
-```
-
-
-### `mode`
-
-The `mode` field specifies the cluster provisioning mode, which can be either `shared` or `virtual`. The default mode is `shared`.
-
-* **`shared` mode:** In this mode, the virtual cluster shares the host cluster's resources and networking. This mode is suitable for lightweight workloads and development environments where isolation is not a primary concern.
-* **`virtual` mode:** In this mode, the virtual cluster runs as a separate K3s cluster within the host cluster. This mode provides stronger isolation and is suitable for production workloads or when dedicated resources are required.
-
-
-### `version`
-
-The `version` field specifies the Kubernetes version to be used by the virtual nodes. If not specified, K3k will use the same K3s version as the host cluster. For example, if the host cluster is running Kubernetes v1.31.3, K3k will use the corresponding K3s version (e.g., `v1.31.3-k3s1`).
-
-
-### `servers`
-
-The `servers` field specifies the number of K3s server nodes to deploy for the virtual cluster. The default value is 1.
-
-
-### `agents`
-
-The `agents` field specifies the number of K3s agent nodes to deploy for the virtual cluster. The default value is 0.
-
-**Note:** In `shared` mode, this field is ignored, as the Virtual Kubelet acts as the agent, and there are no K3s worker nodes.
-
-
-### `nodeSelector`
-
-The `nodeSelector` field allows you to specify a node selector that will be applied to all server/agent pods. In `shared` mode, the node selector will also be applied to the workloads.
-
-
-### `expose`
-
-The `expose` field contains options for exposing the API server of the virtual cluster. By default, the API server is only exposed as a `ClusterIP`, which is relatively secure but difficult to access from outside the cluster.
-
-You can use the `expose` field to enable exposure via `NodePort`, `LoadBalancer`, or `Ingress`.
-
-In this example we are exposing the Cluster with a Nginx ingress-controller, that has to be configured with the `--enable-ssl-passthrough` flag.
-
-
-### `clusterCIDR`
-
-The `clusterCIDR` field specifies the CIDR range for the pods of the cluster. The default value is `10.42.0.0/16`.
-
-
-### `serviceCIDR`
-
-The `serviceCIDR` field specifies the CIDR range for the services in the cluster. The default value is `10.43.0.0/16`.
-
-**Note:** In `shared` mode, the `serviceCIDR` should match the host cluster's `serviceCIDR` to prevent conflicts.
-
-
-### `clusterDNS`
-
-The `clusterDNS` field specifies the IP address for the CoreDNS service. It needs to be in the range provided by `serviceCIDR`. The default value is `10.43.0.10`.
-
-
-### `serverArgs`
-
-The `serverArgs` field allows you to specify additional arguments to be passed to the K3s server pods.

docs/architecture.md

@@ -1,121 +0,0 @@
-# Architecture
-
-Virtual Clusters are isolated Kubernetes clusters provisioned on a physical cluster. K3k leverages [K3s](https://k3s.io/) as the control plane of the Kubernetes cluster because of its lightweight footprint.
-
-K3k provides two modes of deploying virtual clusters: the "shared" mode (default), and "virtual".
-
-
-## Shared Mode
-
-The default `shared` mode uses a K3s server as control plane with an [agentless servers configuration](https://docs.k3s.io/advanced#running-agentless-servers-experimental). With this option enabled, the servers do not run the kubelet, container runtime, or CNI. The server uses a [Virtual Kubelet](https://virtual-kubelet.io/) provider implementation specific to K3k, which schedules the workloads and other eventually needed resources on the host cluster. This K3k Virtual Kubelet provider handles the reflection of resources and workload execution within the shared host cluster environment.
-
-![Shared Mode](./images/architecture/shared-mode.png)
-
-
-### Networking and Storage
-
-Because of this shared infrastructure, the CNI will be the same one configured in the host cluster. To provide the needed isolation, K3k will leverage Network Policies.
-
-The same goes for the available storage, so the Storage Classes and Volumes are those of the host cluster.
-
-
-### Resource Sharing and Limits
-
-In shared mode, K3k leverages Kubernetes ResourceQuotas and LimitRanges to manage resource sharing and enforce limits.  Since all virtual cluster workloads run within the same namespace on the host cluster, ResourceQuotas are applied to this namespace to limit the total resources consumed by a virtual cluster. LimitRanges are used to set default resource requests and limits for pods, ensuring that workloads have reasonable resource allocations even if they don't explicitly specify them.
-
-Each pod in a virtual cluster is assigned a unique name that incorporates the pod name, namespace, and cluster name. This prevents naming collisions in the shared host cluster namespace.
-
-It's important to understand that ResourceQuotas are applied at the namespace level. This means that all pods within a virtual cluster share the same quota.  While this provides overall limits for the virtual cluster, it also means that resource allocation is dynamic. If one workload isn't using its full resource allocation, other workloads within the *same* virtual cluster can utilize those resources, even if they belong to different deployments or services.
-
-This dynamic sharing can be both a benefit and a challenge.  It allows for efficient resource utilization, but it can also lead to unpredictable performance if workloads have varying resource demands.  Furthermore, this approach makes it difficult to guarantee strict resource isolation between workloads within the same virtual cluster.
-
-GPU resource sharing is an area of ongoing investigation. K3k is actively exploring potential solutions in this area.
-
-
-### Isolation and Security
-
-Isolation between virtual clusters in shared mode relies heavily on Kubernetes Network Policies.  Network Policies define rules that control the network traffic allowed to and from pods.  K3k configures Network Policies to ensure that pods in one virtual cluster cannot communicate with pods in other virtual clusters or with pods in the host cluster itself, providing a strong foundation for network isolation.
-
-While Network Policies offer robust isolation capabilities, it's important to understand their characteristics:
-
-* **CNI Integration:** Network Policies integrate seamlessly with supported CNI plugins.  K3k leverages this integration to enforce network isolation.
-* **Granular Control:** Network Policies provide granular control over network traffic, allowing for fine-tuned security policies.
-* **Scalability:** Network Policies scale well with the number of virtual clusters and applications, ensuring consistent isolation as the environment grows.
-
-K3k also utilizes Kubernetes Pod Security Admission (PSA) to enforce security policies within virtual clusters based on Pod Security Standards (PSS).  PSS define different levels of security for pods, restricting what actions pods can perform.  By configuring PSA to enforce a specific PSS level (e.g., `baseline` or `restricted`) for a virtual cluster, K3k ensures that pods adhere to established security best practices and prevents them from using privileged features or performing potentially dangerous operations.
-
-Key aspects of PSA integration include:
-
-* **Namespace-Level Enforcement:** PSA configuration is applied at the namespace level, providing a consistent security posture for all pods within the virtual cluster.
-* **Standardized Profiles:** PSS offers a set of predefined security profiles aligned with industry best practices, simplifying security configuration and ensuring a baseline level of security.
-
-The shared mode architecture is designed with security in mind.  K3k employs multiple layers of security controls, including Network Policies and PSA, to protect virtual clusters and the host cluster.  While the shared namespace model requires careful configuration and management, these controls provide a robust security foundation for running workloads in a multi-tenant environment.  K3k continuously evaluates and enhances its security mechanisms to address evolving threats and ensure the highest level of protection for its users.
-
-
-## Virtual Mode
-
-The `virtual` mode in K3k deploys fully functional K3s clusters (including both server and agent components) as virtual clusters.  These K3s clusters run as pods within the host cluster.  Each virtual cluster has its own dedicated K3s server and one or more K3s agents acting as worker nodes. This approach provides strong isolation, as each virtual cluster operates independently with its own control plane and worker nodes.  While these virtual clusters run as pods on the host cluster, they function as complete and separate Kubernetes environments.
-
-![Virtual Mode](./images/architecture/virtual-mode.png)
-
-
-### Networking and Storage
-
-Virtual clusters in `virtual` mode each have their own independent networking configuration managed by their respective K3s servers.  Each virtual cluster runs its own CNI plugin, configured within its K3s server, providing complete network isolation from other virtual clusters and the host cluster.  While the virtual cluster networks ultimately operate on top of the host cluster's network infrastructure, the networking configuration and traffic management are entirely separate.
-
-
-### Resource Sharing and Limits
-
-Resource sharing in `virtual` mode is managed by applying resource limits to the pods that make up the virtual cluster (both the K3s server pod and the K3s agent pods).  Each pod is assigned a specific amount of CPU, memory, and other resources.  The workloads running *within* the virtual cluster then utilize these allocated resources.  This means that the virtual cluster as a whole has a defined resource pool determined by the limits on its constituent pods.
-
-This approach provides a clear and direct way to control the resources available to each virtual cluster.  However, it requires careful resource planning to ensure that each virtual cluster has sufficient capacity for its workloads.
-
-
-### Isolation and Security
-
-The `virtual` mode offers strong isolation due to the dedicated K3s clusters deployed for each virtual cluster.  Because each virtual cluster runs its own separate control plane and worker nodes, workloads are effectively isolated from each other and from the host cluster.  This architecture minimizes the risk of one virtual cluster impacting others or the host cluster.
-
-Security in `virtual` mode benefits from the inherent isolation provided by the separate K3s clusters.  However, standard Kubernetes security best practices still apply, and K3k emphasizes a layered security approach.  While the K3s server pods often run with elevated privileges (due to the nature of their function, requiring access to system resources), K3k recommends minimizing these privileges whenever possible and adhering to the principle of least privilege.  This can be achieved by carefully configuring the necessary capabilities instead of relying on full `privileged` mode.  Further information on K3s security best practices can be found in the official K3s documentation: [https://docs.k3s.io/security](https://docs.k3s.io/security) (This link provides general security guidance, including discussions of capabilities and other relevant topics).
-
-Currently security in virtual  mode has a risk of privilege escalation as the server pods run with elevated privileges (due to the nature of their function, requiring access to system resources).
-
-
-## K3k Components
-
-K3k consists of two main components:
-
-* **Controller:** The K3k controller is a core component that runs on the host cluster. It watches for `Cluster` custom resources (CRs) and manages the lifecycle of virtual clusters. When a new `Cluster` CR is created, the controller provisions the necessary resources, including namespaces, K3s server and agent pods, and network configurations, to create the virtual cluster.
-* **CLI:** The K3k CLI provides a command-line interface for interacting with K3k. It allows users to easily create, manage, and access virtual clusters. The CLI simplifies common tasks such as creating `Cluster` CRs, retrieving kubeconfigs for accessing virtual clusters, and performing other management operations.
-
-
-## Comparison and Trade-offs
-
-K3k offers two distinct modes for deploying virtual clusters: `shared` and `virtual`. Each mode has its own strengths and weaknesses, and the best choice depends on the specific needs and priorities of the user. Here's a comparison to help you make an informed decision:
-
-| Feature | Shared Mode | Virtual Mode |
-|---|---|---|
-| **Architecture** | Agentless K3s server with Virtual Kubelet | Full K3s cluster (server and agents) as pods |
-| **Isolation** | Network Policies | Dedicated control plane and worker nodes |
-| **Resource Sharing** | Dynamic, namespace-level ResourceQuotas | Resource limits on virtual cluster pods |
-| **Networking** | Host cluster's CNI | Virtual cluster's own CNI |
-| **Storage** | Host cluster's storage | *Under development* |
-| **Security** | Pod Security Admission (PSA), Network Policies | Inherent isolation, PSA, Network Policies, secure host configuration |
-| **Performance** | Smaller footprint, more efficient due to running directly on the host | Higher overhead due to running full K3s clusters |
-
-**Trade-offs:**
-
-* **Isolation vs. Overhead:** The `shared` mode has lower overhead but weaker isolation, while the `virtual` mode provides stronger isolation but potentially higher overhead due to running full K3s clusters.
-* **Resource Sharing:** The `shared` mode offers dynamic resource sharing within a namespace, which can be efficient but less predictable. The `virtual` mode provides dedicated resources to each virtual cluster, offering more control but requiring careful planning.
-
-**Choosing the right mode:**
-
-* **Choose `shared` mode if:**
-    * You prioritize low overhead and resource efficiency.
-    * You need a simple setup and don't require strong isolation between virtual clusters.
-    * Your workloads don't have strict performance requirements.
-    * Your workloads needs host capacities (GPU)
-* **Choose `virtual` mode if:**
-    * You prioritize strong isolation.
-    * You need dedicated resources and predictable performance for your virtual clusters.
-
-Ultimately, the best choice depends on your specific requirements and priorities. Consider the trade-offs carefully and choose the mode that best aligns with your needs.

docs/crds/Makefile

@@ -1,6 +0,0 @@
-CRD_REF_DOCS_VER := v0.1.0
-CRD_REF_DOCS := go run github.com/elastic/crd-ref-docs@$(CRD_REF_DOCS_VER)
-
-.PHONY: generate
-generate:
-	$(CRD_REF_DOCS) --config=config.yaml --renderer=markdown --source-path=../../pkg/apis/k3k.io/v1alpha1 --output-path=crd-docs.md

docs/crds/config.yaml

@@ -1,14 +0,0 @@
-processor:
-  # RE2 regular expressions describing types that should be excluded from the generated documentation.
-  ignoreTypes:
-    - ClusterSet
-    - ClusterSetList
-
-  # RE2 regular expressions describing type fields that should be excluded from the generated documentation.
-  ignoreFields:
-    - "status$"
-    - "TypeMeta$"
-
-render:
-  # Version of Kubernetes to use when generating links to Kubernetes API documentation.
-  kubernetesVersion: "1.31"

docs/crds/crd-docs.md

@@ -1,237 +0,0 @@
-# API Reference
-
-## Packages
-- [k3k.io/v1alpha1](#k3kiov1alpha1)
-
-
-## k3k.io/v1alpha1
-
-
-### Resource Types
-- [Cluster](#cluster)
-- [ClusterList](#clusterlist)
-
-
-
-#### Addon
-
-
-
-
-
-
-
-_Appears in:_
-- [ClusterSpec](#clusterspec)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `secretNamespace` _string_ |  |  |  |
-| `secretRef` _string_ |  |  |  |
-
-
-#### Cluster
-
-
-
-
-
-
-
-_Appears in:_
-- [ClusterList](#clusterlist)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `apiVersion` _string_ | `k3k.io/v1alpha1` | | |
-| `kind` _string_ | `Cluster` | | |
-| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |  |  |
-| `spec` _[ClusterSpec](#clusterspec)_ |  | \{  \} |  |
-
-
-#### ClusterLimit
-
-
-
-
-
-
-
-_Appears in:_
-- [ClusterSpec](#clusterspec)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `serverLimit` _[ResourceList](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#resourcelist-v1-core)_ | ServerLimit is the limits (cpu/mem) that apply to the server nodes |  |  |
-| `workerLimit` _[ResourceList](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#resourcelist-v1-core)_ | WorkerLimit is the limits (cpu/mem) that apply to the agent nodes |  |  |
-
-
-#### ClusterList
-
-
-
-
-
-
-
-
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `apiVersion` _string_ | `k3k.io/v1alpha1` | | |
-| `kind` _string_ | `ClusterList` | | |
-| `metadata` _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#listmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |  |  |
-| `items` _[Cluster](#cluster) array_ |  |  |  |
-
-
-#### ClusterMode
-
-_Underlying type:_ _string_
-
-ClusterMode is the possible provisioning mode of a Cluster.
-
-_Validation:_
-- Enum: [shared virtual]
-
-_Appears in:_
-- [ClusterSpec](#clusterspec)
-
-
-
-#### ClusterSpec
-
-
-
-
-
-
-
-_Appears in:_
-- [Cluster](#cluster)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `version` _string_ | Version is a string representing the Kubernetes version to be used by the virtual nodes. |  |  |
-| `servers` _integer_ | Servers is the number of K3s pods to run in server (controlplane) mode. | 1 |  |
-| `agents` _integer_ | Agents is the number of K3s pods to run in agent (worker) mode. | 0 |  |
-| `nodeSelector` _object (keys:string, values:string)_ | NodeSelector is the node selector that will be applied to all server/agent pods.<br />In "shared" mode the node selector will be applied also to the workloads. |  |  |
-| `priorityClass` _string_ | PriorityClass is the priorityClassName that will be applied to all server/agent pods.<br />In "shared" mode the priorityClassName will be applied also to the workloads. |  |  |
-| `clusterLimit` _[ClusterLimit](#clusterlimit)_ | Limit is the limits that apply for the server/worker nodes. |  |  |
-| `tokenSecretRef` _[SecretReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#secretreference-v1-core)_ | TokenSecretRef is Secret reference used as a token join server and worker nodes to the cluster. The controller<br />assumes that the secret has a field "token" in its data, any other fields in the secret will be ignored. |  |  |
-| `clusterCIDR` _string_ | ClusterCIDR is the CIDR range for the pods of the cluster. Defaults to 10.42.0.0/16. |  |  |
-| `serviceCIDR` _string_ | ServiceCIDR is the CIDR range for the services in the cluster. Defaults to 10.43.0.0/16. |  |  |
-| `clusterDNS` _string_ | ClusterDNS is the IP address for the coredns service. Needs to be in the range provided by ServiceCIDR or CoreDNS may not deploy.<br />Defaults to 10.43.0.10. |  |  |
-| `serverArgs` _string array_ | ServerArgs are the ordered key value pairs (e.x. "testArg", "testValue") for the K3s pods running in server mode. |  |  |
-| `agentArgs` _string array_ | AgentArgs are the ordered key value pairs (e.x. "testArg", "testValue") for the K3s pods running in agent mode. |  |  |
-| `tlsSANs` _string array_ | TLSSANs are the subjectAlternativeNames for the certificate the K3s server will use. |  |  |
-| `addons` _[Addon](#addon) array_ | Addons is a list of secrets containing raw YAML which will be deployed in the virtual K3k cluster on startup. |  |  |
-| `mode` _[ClusterMode](#clustermode)_ | Mode is the cluster provisioning mode which can be either "shared" or "virtual". Defaults to "shared" | shared | Enum: [shared virtual] <br /> |
-| `persistence` _[PersistenceConfig](#persistenceconfig)_ | Persistence contains options controlling how the etcd data of the virtual cluster is persisted. By default, no data<br />persistence is guaranteed, so restart of a virtual cluster pod may result in data loss without this field. | \{ type:dynamic \} |  |
-| `expose` _[ExposeConfig](#exposeconfig)_ | Expose contains options for exposing the apiserver inside/outside of the cluster. By default, this is only exposed as a<br />clusterIP which is relatively secure, but difficult to access outside of the cluster. |  |  |
-
-
-
-
-#### ExposeConfig
-
-
-
-
-
-
-
-_Appears in:_
-- [ClusterSpec](#clusterspec)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `ingress` _[IngressConfig](#ingressconfig)_ |  |  |  |
-| `loadbalancer` _[LoadBalancerConfig](#loadbalancerconfig)_ |  |  |  |
-| `nodePort` _[NodePortConfig](#nodeportconfig)_ |  |  |  |
-
-
-#### IngressConfig
-
-
-
-
-
-
-
-_Appears in:_
-- [ExposeConfig](#exposeconfig)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `annotations` _object (keys:string, values:string)_ | Annotations is a key value map that will enrich the Ingress annotations |  |  |
-| `ingressClassName` _string_ |  |  |  |
-
-
-#### LoadBalancerConfig
-
-
-
-
-
-
-
-_Appears in:_
-- [ExposeConfig](#exposeconfig)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `enabled` _boolean_ |  |  |  |
-
-
-#### NodePortConfig
-
-
-
-
-
-
-
-_Appears in:_
-- [ExposeConfig](#exposeconfig)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `serverPort` _integer_ | ServerPort is the port on each node on which the K3s server service is exposed when type is NodePort.<br />If not specified, a port will be allocated (default: 30000-32767) |  |  |
-| `servicePort` _integer_ | ServicePort is the port on each node on which the K3s service is exposed when type is NodePort.<br />If not specified, a port will be allocated (default: 30000-32767) |  |  |
-| `etcdPort` _integer_ | ETCDPort is the port on each node on which the ETCD service is exposed when type is NodePort.<br />If not specified, a port will be allocated (default: 30000-32767) |  |  |
-
-
-#### PersistenceConfig
-
-
-
-
-
-
-
-_Appears in:_
-- [ClusterSpec](#clusterspec)
-- [ClusterStatus](#clusterstatus)
-
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
-| `type` _[PersistenceMode](#persistencemode)_ |  | dynamic |  |
-| `storageClassName` _string_ |  |  |  |
-| `storageRequestSize` _string_ |  |  |  |
-
-
-#### PersistenceMode
-
-_Underlying type:_ _string_
-
-PersistenceMode is the storage mode of a Cluster.
-
-
-
-_Appears in:_
-- [PersistenceConfig](#persistenceconfig)
-
-
-
-
-

docs/development.md

@@ -1,15 +0,0 @@
-# Development
-
-## Tests
-
-To run the tests we use [Ginkgo](https://onsi.github.io/ginkgo/), and [`envtest`](https://book.kubebuilder.io/reference/envtest) for testing the controllers.
-
-Install the required binaries from `envtest` with [`setup-envtest`](https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest), and then put them in the default path `/usr/local/kubebuilder/bin`:
-
-```
-ENVTEST_BIN=$(setup-envtest use -p path)
-sudo mkdir -p /usr/local/kubebuilder/bin
-sudo cp $ENVTEST_BIN/* /usr/local/kubebuilder/bin
-```
-
-then run `ginkgo run ./...`.

examples/clusterset.yaml

@@ -1,11 +0,0 @@
-apiVersion: k3k.io/v1alpha1
-kind: ClusterSet
-metadata:
-  name: clusterset-example
-# spec:
-  # disableNetworkPolicy: false
-  # allowedNodeTypes:
-  # - "shared"
-  # - "virtual"
-  # podSecurityAdmissionLevel: "baseline"
-  # defaultPriorityClass: "lowpriority"

examples/multiple-servers.yaml

@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   name: example1
 spec:
-  mode: "shared"
   servers: 1
   agents: 3
   token: test

examples/single-server.yaml

@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   name: single-server
 spec:
-  mode: "shared"
   servers: 1
   agents: 3
   token: test

go.mod

@@ -1,217 +1,74 @@
 module github.com/rancher/k3k
 
-go 1.23.4
+go 1.19
 
-replace (
-	github.com/google/cel-go => github.com/google/cel-go v0.17.7
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/client_model => github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common => github.com/prometheus/common v0.47.0
-	golang.org/x/term => golang.org/x/term v0.15.0
+require (
+	github.com/sirupsen/logrus v1.8.1
+	github.com/urfave/cli v1.22.12
+	k8s.io/api v0.26.1
+	k8s.io/apimachinery v0.26.1
+	k8s.io/client-go v0.26.1
+	k8s.io/klog v1.0.0
 )
 
 require (
-	github.com/go-logr/zapr v1.3.0
-	github.com/onsi/ginkgo/v2 v2.21.0
-	github.com/onsi/gomega v1.36.0
-	github.com/prometheus/client_model v0.6.1
-	github.com/rancher/dynamiclistener v1.27.5
-	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.10.0
-	github.com/testcontainers/testcontainers-go v0.35.0
-	github.com/testcontainers/testcontainers-go/modules/k3s v0.35.0
-	github.com/urfave/cli/v2 v2.27.5
-	github.com/virtual-kubelet/virtual-kubelet v1.11.0
-	go.etcd.io/etcd/api/v3 v3.5.16
-	go.etcd.io/etcd/client/v3 v3.5.16
-	go.uber.org/zap v1.27.0
-	gopkg.in/yaml.v2 v2.4.0
-	helm.sh/helm/v3 v3.14.4
-	k8s.io/api v0.29.11
-	k8s.io/apimachinery v0.29.11
-	k8s.io/apiserver v0.29.11
-	k8s.io/client-go v0.29.11
-	k8s.io/component-base v0.29.11
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
-	sigs.k8s.io/controller-runtime v0.17.5
-)
-
-require (
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
-	github.com/MakeNowJust/heredoc v1.0.0 // indirect
-	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
-	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
-	github.com/Masterminds/squirrel v1.5.4 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
-	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/containerd/containerd v1.7.24 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/dockercfg v0.3.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/cli v25.0.1+incompatible // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.7.0 // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
-	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-errors/errors v1.4.2 // indirect
-	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.20.0 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cel-go v0.22.0 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/gosuri/uitable v0.0.4 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.26.0 // indirect
+	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
+
+require (
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
-	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
-	github.com/lib/pq v1.10.9 // indirect
-	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/locker v1.0.1 // indirect
-	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/spdystream v0.5.0 // indirect
-	github.com/moby/sys/mountinfo v0.7.2 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rubenv/sql-migrate v1.7.1 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xlab/treeprint v1.2.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
-	google.golang.org/grpc v1.65.0 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	github.com/rancher/dynamiclistener v0.3.5
+	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
+	golang.org/x/text v0.5.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.11 // indirect
-	k8s.io/cli-runtime v0.29.11 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kms v0.29.11 // indirect
-	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
-	k8s.io/kubectl v0.29.11 // indirect
-	oras.land/oras-go v1.2.5 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/kustomize/api v0.18.0 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/apiserver v0.26.1
+	k8s.io/klog/v2 v2.80.1
+	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
+	sigs.k8s.io/controller-runtime v0.14.1
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )

hack/update-codegen.sh

@@ -4,25 +4,18 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-set -x
 CODEGEN_GIT_PKG=https://github.com/kubernetes/code-generator.git
 git clone --depth 1 ${CODEGEN_GIT_PKG} || true
 
-K8S_VERSION=$(cat go.mod | grep -m1 "k8s.io/apiserver" | cut -d " " -f 2)
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 CODEGEN_PKG=./code-generator
 
-# cd into the git dir to checkout the code gen version compatible with the k8s version that this is using
-cd $CODEGEN_PKG
-git fetch origin tag ${K8S_VERSION}
-git checkout ${K8S_VERSION}
-cd -
-
-source ${CODEGEN_PKG}/kube_codegen.sh
-
-kube::codegen::gen_helpers \
-    --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
-    --input-pkg-root "${SCRIPT_ROOT}/pkg/apis" \
-    --output-base "${SCRIPT_ROOT}/pkg/apis"
+"${CODEGEN_PKG}/generate-groups.sh" \
+ "deepcopy" \
+ github.com/rancher/k3k/pkg/generated \
+ github.com/rancher/k3k/pkg/apis \
+ "k3k.io:v1alpha1" \
+ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
+ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.."
 
 rm -rf code-generator

k3k-kubelet/README.md

@@ -1,34 +0,0 @@
-## Virtual Kubelet
-
-This package provides an impelementation of a virtual cluster node using [virtual-kubelet](https://github.com/virtual-kubelet/virtual-kubelet).
-
-The implementation is based on several projects, including:
-- [Virtual Kubelet](https://github.com/virtual-kubelet/virtual-kubelet)
-- [Kubectl](https://github.com/kubernetes/kubectl)
-- [Client-go](https://github.com/kubernetes/client-go)
-- [Azure-Aci](https://github.com/virtual-kubelet/azure-aci)
-
-## Overview
-
-This project creates a node that registers itself in the virtual cluster. When workloads are scheduled to this node, it simply creates/updates the workload on the host cluster.  
-
-## Usage
-
-Build/Push the image using (from the root of rancher/k3k):
-
-```
-make build
-docker buildx build -f package/Dockerfile . -t $REPO/$IMAGE:$TAG
-```
-
-When running, it is recommended to deploy a k3k cluster with 1 server (with `--disable-agent` as a server arg) and no agents (so that the workloads can only be scheduled on the virtual node/host cluster).
-
-After the image is built, it should be deployed with the following ENV vars set:
-- `CLUSTER_NAME` should be the name of the cluster.
-- `CLUSTER_NAMESPACE` should be the namespace the cluster is running in.
-- `HOST_KUBECONFIG` should be the path on the local filesystem (in container) to a kubeconfig for the host cluster (likely stored in a secret/mounted as a volume).
-- `VIRT_KUBECONFIG`should be the path on the local filesystem (in container) to a kubeconfig for the virtual cluster (likely stored in a secret/mounted as a volume).
-- `VIRT_POD_IP` should be the IP that the container is accessible from.
-
-This project is still under development and there are many features yet to be implemented, but it can run a basic nginx pod.
-

k3k-kubelet/config.go

@@ -1,87 +0,0 @@
-package main
-
-import (
-	"errors"
-	"os"
-
-	"gopkg.in/yaml.v2"
-)
-
-// config has all virtual-kubelet startup options
-type config struct {
-	ClusterName       string `yaml:"clusterName,omitempty"`
-	ClusterNamespace  string `yaml:"clusterNamespace,omitempty"`
-	ServiceName       string `yaml:"serviceName,omitempty"`
-	Token             string `yaml:"token,omitempty"`
-	AgentHostname     string `yaml:"agentHostname,omitempty"`
-	HostConfigPath    string `yaml:"hostConfigPath,omitempty"`
-	VirtualConfigPath string `yaml:"virtualConfigPath,omitempty"`
-	KubeletPort       string `yaml:"kubeletPort,omitempty"`
-	ServerIP          string `yaml:"serverIP,omitempty"`
-	Version           string `yaml:"version,omitempty"`
-}
-
-func (c *config) unmarshalYAML(data []byte) error {
-	var conf config
-
-	if err := yaml.Unmarshal(data, &conf); err != nil {
-		return err
-	}
-
-	if c.ClusterName == "" {
-		c.ClusterName = conf.ClusterName
-	}
-	if c.ClusterNamespace == "" {
-		c.ClusterNamespace = conf.ClusterNamespace
-	}
-	if c.HostConfigPath == "" {
-		c.HostConfigPath = conf.HostConfigPath
-	}
-	if c.VirtualConfigPath == "" {
-		c.VirtualConfigPath = conf.VirtualConfigPath
-	}
-	if c.KubeletPort == "" {
-		c.KubeletPort = conf.KubeletPort
-	}
-	if c.AgentHostname == "" {
-		c.AgentHostname = conf.AgentHostname
-	}
-	if c.ServiceName == "" {
-		c.ServiceName = conf.ServiceName
-	}
-	if c.Token == "" {
-		c.Token = conf.Token
-	}
-	if c.ServerIP == "" {
-		c.ServerIP = conf.ServerIP
-	}
-	if c.Version == "" {
-		c.Version = conf.Version
-	}
-	return nil
-}
-
-func (c *config) validate() error {
-	if c.ClusterName == "" {
-		return errors.New("cluster name is not provided")
-	}
-	if c.ClusterNamespace == "" {
-		return errors.New("cluster namespace is not provided")
-	}
-	if c.AgentHostname == "" {
-		return errors.New("agent Hostname is not provided")
-	}
-	return nil
-}
-
-func (c *config) parse(path string) error {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return nil
-	}
-
-	b, err := os.ReadFile(path)
-	if err != nil {
-		return err
-	}
-	return c.unmarshalYAML(b)
-}

k3k-kubelet/controller/configmap.go

@@ -1,166 +0,0 @@
-package controller
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/rancher/k3k/pkg/controller"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/util/retry"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-type ConfigMapSyncer struct {
-	mutex sync.RWMutex
-	// VirtualClient is the client for the virtual cluster
-	VirtualClient client.Client
-	// CoreClient is the client for the host cluster
-	HostClient client.Client
-	// TranslateFunc is the function that translates a given resource from it's virtual representation to the host
-	// representation
-	TranslateFunc func(*corev1.ConfigMap) (*corev1.ConfigMap, error)
-	// Logger is the logger that the controller will use
-	Logger *k3klog.Logger
-	// objs are the objects that the syncer should watch/syncronize. Should only be manipulated
-	// through add/remove
-	objs sets.Set[types.NamespacedName]
-}
-
-// Reconcile implements reconcile.Reconciler and synchronizes the objects in objs to the host cluster
-func (c *ConfigMapSyncer) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	if !c.isWatching(req.NamespacedName) {
-		// return immediately without re-enqueueing. We aren't watching this resource
-		return reconcile.Result{}, nil
-	}
-	var virtual corev1.ConfigMap
-
-	if err := c.VirtualClient.Get(ctx, req.NamespacedName, &virtual); err != nil {
-		return reconcile.Result{
-			Requeue: true,
-		}, fmt.Errorf("unable to get configmap %s/%s from virtual cluster: %w", req.Namespace, req.Name, err)
-	}
-	translated, err := c.TranslateFunc(&virtual)
-	if err != nil {
-		return reconcile.Result{
-			Requeue: true,
-		}, fmt.Errorf("unable to translate configmap %s/%s from virtual cluster: %w", req.Namespace, req.Name, err)
-	}
-	translatedKey := types.NamespacedName{
-		Namespace: translated.Namespace,
-		Name:      translated.Name,
-	}
-	var host corev1.ConfigMap
-	if err = c.HostClient.Get(ctx, translatedKey, &host); err != nil {
-		if apierrors.IsNotFound(err) {
-			err = c.HostClient.Create(ctx, translated)
-			// for simplicity's sake, we don't check for conflict errors. The existing object will get
-			// picked up on in the next re-enqueue
-			return reconcile.Result{
-					Requeue: true,
-				}, fmt.Errorf("unable to create host configmap %s/%s for virtual configmap %s/%s: %w",
-					translated.Namespace, translated.Name, req.Namespace, req.Name, err)
-		}
-		return reconcile.Result{Requeue: true}, fmt.Errorf("unable to get host configmap %s/%s: %w", translated.Namespace, translated.Name, err)
-	}
-	// we are going to use the host in order to avoid conflicts on update
-	host.Data = translated.Data
-	if host.Labels == nil {
-		host.Labels = make(map[string]string, len(translated.Labels))
-	}
-	// we don't want to override labels made on the host cluster by other applications
-	// but we do need to make sure the labels that the kubelet uses to track host cluster values
-	// are being tracked appropriately
-	for key, value := range translated.Labels {
-		host.Labels[key] = value
-	}
-	if err = c.HostClient.Update(ctx, &host); err != nil {
-		return reconcile.Result{
-				Requeue: true,
-			}, fmt.Errorf("unable to update host configmap %s/%s for virtual configmap %s/%s: %w",
-				translated.Namespace, translated.Name, req.Namespace, req.Name, err)
-
-	}
-	return reconcile.Result{}, nil
-}
-
-// isWatching is a utility method to determine if a key is in objs without the caller needing
-// to handle mutex lock/unlock.
-func (c *ConfigMapSyncer) isWatching(key types.NamespacedName) bool {
-	c.mutex.RLock()
-	defer c.mutex.RUnlock()
-	return c.objs.Has(key)
-}
-
-// AddResource adds a given resource to the list of resources that will be synced. Safe to call multiple times for the
-// same resource.
-func (c *ConfigMapSyncer) AddResource(ctx context.Context, namespace, name string) error {
-	objKey := types.NamespacedName{
-		Namespace: namespace,
-		Name:      name,
-	}
-	// if we already sync this object, no need to writelock/add it
-	if c.isWatching(objKey) {
-		return nil
-	}
-	// lock in write mode since we are now adding the key
-	c.mutex.Lock()
-	if c.objs == nil {
-		c.objs = sets.Set[types.NamespacedName]{}
-	}
-	c.objs = c.objs.Insert(objKey)
-	c.mutex.Unlock()
-	_, err := c.Reconcile(ctx, reconcile.Request{
-		NamespacedName: objKey,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to reconcile new object %s/%s: %w", objKey.Namespace, objKey.Name, err)
-	}
-	return nil
-}
-
-// RemoveResource removes a given resource from the list of resources that will be synced. Safe to call for an already
-// removed resource.
-func (c *ConfigMapSyncer) RemoveResource(ctx context.Context, namespace, name string) error {
-	objKey := types.NamespacedName{
-		Namespace: namespace,
-		Name:      name,
-	}
-	// if we don't sync this object, no need to writelock/add it
-	if !c.isWatching(objKey) {
-		return nil
-	}
-
-	if err := retry.OnError(controller.Backoff, func(err error) bool {
-		return err != nil
-	}, func() error {
-		return c.removeHostConfigMap(ctx, namespace, name)
-	}); err != nil {
-		return fmt.Errorf("unable to remove configmap: %w", err)
-	}
-	c.mutex.Lock()
-	if c.objs == nil {
-		c.objs = sets.Set[types.NamespacedName]{}
-	}
-	c.objs = c.objs.Delete(objKey)
-	c.mutex.Unlock()
-	return nil
-}
-
-func (c *ConfigMapSyncer) removeHostConfigMap(ctx context.Context, virtualNamespace, virtualName string) error {
-	var vConfigMap corev1.ConfigMap
-	err := c.VirtualClient.Get(ctx, types.NamespacedName{Namespace: virtualNamespace, Name: virtualName}, &vConfigMap)
-	if err != nil {
-		return fmt.Errorf("unable to get virtual configmap %s/%s: %w", virtualNamespace, virtualName, err)
-	}
-	translated, err := c.TranslateFunc(&vConfigMap)
-	if err != nil {
-		return fmt.Errorf("unable to translate virtual secret: %s/%s: %w", virtualNamespace, virtualName, err)
-	}
-	return c.HostClient.Delete(ctx, translated)
-}

k3k-kubelet/controller/handler.go

@@ -1,119 +0,0 @@
-package controller
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/rancher/k3k/k3k-kubelet/translate"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-type ControllerHandler struct {
-	sync.RWMutex
-	// Mgr is the manager used to run new controllers - from the virtual cluster
-	Mgr manager.Manager
-	// Scheme is the scheme used to run new controllers - from the virtual cluster
-	Scheme runtime.Scheme
-	// HostClient is the client used to communicate with the host cluster
-	HostClient client.Client
-	// VirtualClient is the client used to communicate with the virtual cluster
-	VirtualClient client.Client
-	// Translator is the translator that will be used to adjust objects before they
-	// are made on the host cluster
-	Translator translate.ToHostTranslator
-	// Logger is the logger that the controller will use to log errors
-	Logger *k3klog.Logger
-	// controllers are the controllers which are currently running
-	controllers map[schema.GroupVersionKind]updateableReconciler
-}
-
-// updateableReconciler is a reconciler that only syncs specific resources (by name/namespace). This list can
-// be altered through the Add and Remove methods
-type updateableReconciler interface {
-	reconcile.Reconciler
-	AddResource(ctx context.Context, namespace string, name string) error
-	RemoveResource(ctx context.Context, namespace string, name string) error
-}
-
-func (c *ControllerHandler) AddResource(ctx context.Context, obj client.Object) error {
-	c.RLock()
-	controllers := c.controllers
-	if controllers != nil {
-		if r, ok := c.controllers[obj.GetObjectKind().GroupVersionKind()]; ok {
-			err := r.AddResource(ctx, obj.GetNamespace(), obj.GetName())
-			c.RUnlock()
-			return err
-		}
-	}
-	// we need to manually lock/unlock since we intned on write locking to add a new controller
-	c.RUnlock()
-	var r updateableReconciler
-	switch obj.(type) {
-	case *v1.Secret:
-		r = &SecretSyncer{
-			HostClient:    c.HostClient,
-			VirtualClient: c.VirtualClient,
-			// TODO: Need actual function
-			TranslateFunc: func(s *v1.Secret) (*v1.Secret, error) {
-				// note that this doesn't do any type safety - fix this
-				// when generics work
-				c.Translator.TranslateTo(s)
-				// Remove service-account-token types when synced to the host
-				if s.Type == v1.SecretTypeServiceAccountToken {
-					s.Type = v1.SecretTypeOpaque
-				}
-				return s, nil
-			},
-			Logger: c.Logger,
-		}
-	case *v1.ConfigMap:
-		r = &ConfigMapSyncer{
-			HostClient:    c.HostClient,
-			VirtualClient: c.VirtualClient,
-			// TODO: Need actual function
-			TranslateFunc: func(s *v1.ConfigMap) (*v1.ConfigMap, error) {
-				c.Translator.TranslateTo(s)
-				return s, nil
-			},
-			Logger: c.Logger,
-		}
-	default:
-		// TODO: Technically, the configmap/secret syncers are relatively generic, and this
-		// logic could be used for other types.
-		return fmt.Errorf("unrecognized type: %T", obj)
-
-	}
-	err := ctrl.NewControllerManagedBy(c.Mgr).
-		For(&v1.ConfigMap{}).
-		Complete(r)
-	if err != nil {
-		return fmt.Errorf("unable to start configmap controller: %w", err)
-	}
-	c.Lock()
-	if c.controllers == nil {
-		c.controllers = map[schema.GroupVersionKind]updateableReconciler{}
-	}
-	c.controllers[obj.GetObjectKind().GroupVersionKind()] = r
-	c.Unlock()
-
-	return r.AddResource(ctx, obj.GetNamespace(), obj.GetName())
-}
-
-func (c *ControllerHandler) RemoveResource(ctx context.Context, obj client.Object) error {
-	// since we aren't adding a new controller, we don't need to lock
-	c.RLock()
-	ctrl, ok := c.controllers[obj.GetObjectKind().GroupVersionKind()]
-	c.RUnlock()
-	if !ok {
-		return fmt.Errorf("no controller found for gvk %s", obj.GetObjectKind().GroupVersionKind())
-	}
-	return ctrl.RemoveResource(ctx, obj.GetNamespace(), obj.GetName())
-}

k3k-kubelet/controller/persistentvolumeclaims.go

@@ -1,121 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"github.com/rancher/k3k/k3k-kubelet/translate"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/log"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-const (
-	pvcController    = "pvc-syncer-controller"
-	pvcFinalizerName = "pvc.k3k.io/finalizer"
-)
-
-type PVCReconciler struct {
-	virtualClient    ctrlruntimeclient.Client
-	hostClient       ctrlruntimeclient.Client
-	clusterName      string
-	clusterNamespace string
-	Scheme           *runtime.Scheme
-	HostScheme       *runtime.Scheme
-	logger           *log.Logger
-	Translator       translate.ToHostTranslator
-}
-
-// AddPVCSyncer adds persistentvolumeclaims syncer controller to k3k-kubelet
-func AddPVCSyncer(ctx context.Context, virtMgr, hostMgr manager.Manager, clusterName, clusterNamespace string, logger *log.Logger) error {
-	translator := translate.ToHostTranslator{
-		ClusterName:      clusterName,
-		ClusterNamespace: clusterNamespace,
-	}
-	// initialize a new Reconciler
-	reconciler := PVCReconciler{
-		virtualClient:    virtMgr.GetClient(),
-		hostClient:       hostMgr.GetClient(),
-		Scheme:           virtMgr.GetScheme(),
-		HostScheme:       hostMgr.GetScheme(),
-		logger:           logger.Named(pvcController),
-		Translator:       translator,
-		clusterName:      clusterName,
-		clusterNamespace: clusterNamespace,
-	}
-	return ctrl.NewControllerManagedBy(virtMgr).
-		For(&v1.PersistentVolumeClaim{}).
-		WithOptions(controller.Options{
-			MaxConcurrentReconciles: maxConcurrentReconciles,
-		}).
-		Complete(&reconciler)
-}
-
-func (r *PVCReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	log := r.logger.With("Cluster", r.clusterName, "PersistentVolumeClaim", req.NamespacedName)
-	var (
-		virtPVC v1.PersistentVolumeClaim
-		hostPVC v1.PersistentVolumeClaim
-		cluster v1alpha1.Cluster
-	)
-	if err := r.hostClient.Get(ctx, types.NamespacedName{Name: r.clusterName, Namespace: r.clusterNamespace}, &cluster); err != nil {
-		return reconcile.Result{}, err
-	}
-
-	// handling persistent volume sync
-	if err := r.virtualClient.Get(ctx, req.NamespacedName, &virtPVC); err != nil {
-		return reconcile.Result{}, ctrlruntimeclient.IgnoreNotFound(err)
-	}
-	syncedPVC := r.pvc(&virtPVC)
-	if err := controllerutil.SetControllerReference(&cluster, syncedPVC, r.HostScheme); err != nil {
-		return reconcile.Result{}, err
-	}
-	// handle deletion
-	if !virtPVC.DeletionTimestamp.IsZero() {
-		// deleting the synced service if exists
-		if err := r.hostClient.Delete(ctx, syncedPVC); !apierrors.IsNotFound(err) {
-			return reconcile.Result{}, err
-		}
-		// remove the finalizer after cleaning up the synced service
-		if controllerutil.RemoveFinalizer(&virtPVC, pvcFinalizerName) {
-			if err := r.virtualClient.Update(ctx, &virtPVC); err != nil {
-				return reconcile.Result{}, err
-			}
-		}
-		return reconcile.Result{}, nil
-	}
-
-	// getting the cluster for setting the controller reference
-
-	// Add finalizer if it does not exist
-	if controllerutil.AddFinalizer(&virtPVC, pvcFinalizerName) {
-		if err := r.virtualClient.Update(ctx, &virtPVC); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-	// create or update the pvc on host
-	if err := r.hostClient.Get(ctx, types.NamespacedName{Name: syncedPVC.Name, Namespace: r.clusterNamespace}, &hostPVC); err != nil {
-		if apierrors.IsNotFound(err) {
-			log.Info("creating the persistent volume for the first time on the host cluster")
-			return reconcile.Result{}, r.hostClient.Create(ctx, syncedPVC)
-		}
-		return reconcile.Result{}, err
-	}
-	log.Info("updating pvc on the host cluster")
-	return reconcile.Result{}, r.hostClient.Update(ctx, syncedPVC)
-
-}
-
-func (r *PVCReconciler) pvc(obj *v1.PersistentVolumeClaim) *v1.PersistentVolumeClaim {
-	hostPVC := obj.DeepCopy()
-	r.Translator.TranslateTo(hostPVC)
-	return hostPVC
-}

k3k-kubelet/controller/secret.go

@@ -1,170 +0,0 @@
-package controller
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/rancher/k3k/pkg/controller"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/util/retry"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-type SecretSyncer struct {
-	mutex sync.RWMutex
-	// VirtualClient is the client for the virtual cluster
-	VirtualClient client.Client
-	// CoreClient is the client for the host cluster
-	HostClient client.Client
-	// TranslateFunc is the function that translates a given resource from it's virtual representation to the host
-	// representation
-	TranslateFunc func(*corev1.Secret) (*corev1.Secret, error)
-	// Logger is the logger that the controller will use
-	Logger *k3klog.Logger
-	// objs are the objects that the syncer should watch/syncronize. Should only be manipulated
-	// through add/remove
-	objs sets.Set[types.NamespacedName]
-}
-
-// Reconcile implements reconcile.Reconciler and synchronizes the objects in objs to the host cluster
-func (s *SecretSyncer) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	if !s.isWatching(req.NamespacedName) {
-		// return immediately without re-enqueueing. We aren't watching this resource
-		return reconcile.Result{}, nil
-	}
-	var virtual corev1.Secret
-
-	if err := s.VirtualClient.Get(ctx, req.NamespacedName, &virtual); err != nil {
-		return reconcile.Result{
-			Requeue: true,
-		}, fmt.Errorf("unable to get secret %s/%s from virtual cluster: %w", req.Namespace, req.Name, err)
-	}
-	translated, err := s.TranslateFunc(&virtual)
-	if err != nil {
-		return reconcile.Result{
-			Requeue: true,
-		}, fmt.Errorf("unable to translate secret %s/%s from virtual cluster: %w", req.Namespace, req.Name, err)
-	}
-	translatedKey := types.NamespacedName{
-		Namespace: translated.Namespace,
-		Name:      translated.Name,
-	}
-	var host corev1.Secret
-	if err = s.HostClient.Get(ctx, translatedKey, &host); err != nil {
-		if apierrors.IsNotFound(err) {
-			err = s.HostClient.Create(ctx, translated)
-			// for simplicity's sake, we don't check for conflict errors. The existing object will get
-			// picked up on in the next re-enqueue
-			return reconcile.Result{
-					Requeue: true,
-				}, fmt.Errorf("unable to create host secret %s/%s for virtual secret %s/%s: %w",
-					translated.Namespace, translated.Name, req.Namespace, req.Name, err)
-		}
-		return reconcile.Result{Requeue: true}, fmt.Errorf("unable to get host secret %s/%s: %w", translated.Namespace, translated.Name, err)
-	}
-	// we are going to use the host in order to avoid conflicts on update
-	host.Data = translated.Data
-	if host.Labels == nil {
-		host.Labels = make(map[string]string, len(translated.Labels))
-	}
-	// we don't want to override labels made on the host cluster by other applications
-	// but we do need to make sure the labels that the kubelet uses to track host cluster values
-	// are being tracked appropriately
-	for key, value := range translated.Labels {
-		host.Labels[key] = value
-	}
-	if err = s.HostClient.Update(ctx, &host); err != nil {
-		return reconcile.Result{
-				Requeue: true,
-			}, fmt.Errorf("unable to update host secret %s/%s for virtual secret %s/%s: %w",
-				translated.Namespace, translated.Name, req.Namespace, req.Name, err)
-
-	}
-	return reconcile.Result{}, nil
-}
-
-// isWatching is a utility method to determine if a key is in objs without the caller needing
-// to handle mutex lock/unlock.
-func (s *SecretSyncer) isWatching(key types.NamespacedName) bool {
-	s.mutex.RLock()
-	defer s.mutex.RUnlock()
-	return s.objs.Has(key)
-}
-
-// AddResource adds a given resource to the list of resources that will be synced. Safe to call multiple times for the
-// same resource.
-func (s *SecretSyncer) AddResource(ctx context.Context, namespace, name string) error {
-	objKey := types.NamespacedName{
-		Namespace: namespace,
-		Name:      name,
-	}
-	// if we already sync this object, no need to writelock/add it
-	if s.isWatching(objKey) {
-		return nil
-	}
-	// lock in write mode since we are now adding the key
-	s.mutex.Lock()
-	if s.objs == nil {
-		s.objs = sets.Set[types.NamespacedName]{}
-	}
-	s.objs = s.objs.Insert(objKey)
-	s.mutex.Unlock()
-	_, err := s.Reconcile(ctx, reconcile.Request{
-		NamespacedName: objKey,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to reconcile new object %s/%s: %w", objKey.Namespace, objKey.Name, err)
-	}
-	return nil
-}
-
-// RemoveResource removes a given resource from the list of resources that will be synced. Safe to call for an already
-// removed resource.
-func (s *SecretSyncer) RemoveResource(ctx context.Context, namespace, name string) error {
-	objKey := types.NamespacedName{
-		Namespace: namespace,
-		Name:      name,
-	}
-	// if we don't sync this object, no need to writelock/add it
-	if !s.isWatching(objKey) {
-		return nil
-	}
-	// lock in write mode since we are now adding the key
-	if err := retry.OnError(controller.Backoff, func(err error) bool {
-		return err != nil
-	}, func() error {
-		return s.removeHostSecret(ctx, namespace, name)
-	}); err != nil {
-		return fmt.Errorf("unable to remove secret: %w", err)
-	}
-
-	s.mutex.Lock()
-	if s.objs == nil {
-		s.objs = sets.Set[types.NamespacedName]{}
-	}
-	s.objs = s.objs.Delete(objKey)
-	s.mutex.Unlock()
-	return nil
-}
-
-func (s *SecretSyncer) removeHostSecret(ctx context.Context, virtualNamespace, virtualName string) error {
-	var vSecret corev1.Secret
-	err := s.VirtualClient.Get(ctx, types.NamespacedName{
-		Namespace: virtualNamespace,
-		Name:      virtualName,
-	}, &vSecret)
-	if err != nil {
-		return fmt.Errorf("unable to get virtual secret %s/%s: %w", virtualNamespace, virtualName, err)
-	}
-	translated, err := s.TranslateFunc(&vSecret)
-	if err != nil {
-		return fmt.Errorf("unable to translate virtual secret: %s/%s: %w", virtualNamespace, virtualName, err)
-	}
-	return s.HostClient.Delete(ctx, translated)
-}

k3k-kubelet/controller/service.go

@@ -1,126 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"github.com/rancher/k3k/k3k-kubelet/translate"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/log"
-
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-const (
-	serviceSyncerController = "service-syncer-controller"
-	maxConcurrentReconciles = 1
-	serviceFinalizerName    = "service.k3k.io/finalizer"
-)
-
-type ServiceReconciler struct {
-	virtualClient    ctrlruntimeclient.Client
-	hostClient       ctrlruntimeclient.Client
-	clusterName      string
-	clusterNamespace string
-	Scheme           *runtime.Scheme
-	HostScheme       *runtime.Scheme
-	logger           *log.Logger
-	Translator       translate.ToHostTranslator
-}
-
-// AddServiceSyncer adds service syncer controller to the manager of the virtual cluster
-func AddServiceSyncer(ctx context.Context, virtMgr, hostMgr manager.Manager, clusterName, clusterNamespace string, logger *log.Logger) error {
-	translator := translate.ToHostTranslator{
-		ClusterName:      clusterName,
-		ClusterNamespace: clusterNamespace,
-	}
-	// initialize a new Reconciler
-	reconciler := ServiceReconciler{
-		virtualClient:    virtMgr.GetClient(),
-		hostClient:       hostMgr.GetClient(),
-		Scheme:           virtMgr.GetScheme(),
-		HostScheme:       hostMgr.GetScheme(),
-		logger:           logger.Named(serviceSyncerController),
-		Translator:       translator,
-		clusterName:      clusterName,
-		clusterNamespace: clusterNamespace,
-	}
-	return ctrl.NewControllerManagedBy(virtMgr).
-		For(&v1.Service{}).
-		WithOptions(controller.Options{
-			MaxConcurrentReconciles: maxConcurrentReconciles,
-		}).
-		Complete(&reconciler)
-}
-
-func (s *ServiceReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	log := s.logger.With("Cluster", s.clusterName, "Service", req.NamespacedName)
-	if req.Name == "kubernetes" || req.Name == "kube-dns" {
-		return reconcile.Result{}, nil
-	}
-	var (
-		virtService v1.Service
-		hostService v1.Service
-		cluster     v1alpha1.Cluster
-	)
-	// getting the cluster for setting the controller reference
-	if err := s.hostClient.Get(ctx, types.NamespacedName{Name: s.clusterName, Namespace: s.clusterNamespace}, &cluster); err != nil {
-		return reconcile.Result{}, err
-	}
-	if err := s.virtualClient.Get(ctx, req.NamespacedName, &virtService); err != nil {
-		return reconcile.Result{}, ctrlruntimeclient.IgnoreNotFound(err)
-	}
-	syncedService := s.service(&virtService)
-	if err := controllerutil.SetControllerReference(&cluster, syncedService, s.HostScheme); err != nil {
-		return reconcile.Result{}, err
-	}
-
-	// handle deletion
-	if !virtService.DeletionTimestamp.IsZero() {
-		// deleting the synced service if exists
-		if err := s.hostClient.Delete(ctx, syncedService); err != nil {
-			return reconcile.Result{}, ctrlruntimeclient.IgnoreNotFound(err)
-		}
-		// remove the finalizer after cleaning up the synced service
-		if controllerutil.ContainsFinalizer(&virtService, serviceFinalizerName) {
-			controllerutil.RemoveFinalizer(&virtService, serviceFinalizerName)
-			if err := s.virtualClient.Update(ctx, &virtService); err != nil {
-				return reconcile.Result{}, err
-			}
-		}
-		return reconcile.Result{}, nil
-	}
-
-	// Add finalizer if it does not exist
-	if !controllerutil.ContainsFinalizer(&virtService, serviceFinalizerName) {
-		controllerutil.AddFinalizer(&virtService, serviceFinalizerName)
-		if err := s.virtualClient.Update(ctx, &virtService); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-	// create or update the service on host
-	if err := s.hostClient.Get(ctx, types.NamespacedName{Name: syncedService.Name, Namespace: s.clusterNamespace}, &hostService); err != nil {
-		if apierrors.IsNotFound(err) {
-			log.Info("creating the service for the first time on the host cluster")
-			return reconcile.Result{}, s.hostClient.Create(ctx, syncedService)
-		}
-		return reconcile.Result{}, err
-	}
-	log.Info("updating service on the host cluster")
-	return reconcile.Result{}, s.hostClient.Update(ctx, syncedService)
-}
-
-func (s *ServiceReconciler) service(obj *v1.Service) *v1.Service {
-	hostService := obj.DeepCopy()
-	s.Translator.TranslateTo(hostService)
-	// don't sync finalizers to the host
-	return hostService
-}

k3k-kubelet/controller/webhook/pod.go

@@ -1,166 +0,0 @@
-package webhook
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/rancher/k3k/pkg/controller/cluster/agent"
-	"github.com/rancher/k3k/pkg/log"
-	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/ptr"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-)
-
-const (
-	webhookName    = "podmutator.k3k.io"
-	webhookTimeout = int32(10)
-	webhookPort    = "9443"
-	webhookPath    = "/mutate--v1-pod"
-	FieldpathField = "k3k.io/fieldpath"
-)
-
-type webhookHandler struct {
-	client           ctrlruntimeclient.Client
-	scheme           *runtime.Scheme
-	nodeName         string
-	serviceName      string
-	clusterName      string
-	clusterNamespace string
-	logger           *log.Logger
-}
-
-// AddPodMutatorWebhook will add a mutator webhook to the virtual cluster to
-// modify the nodeName of the created pods with the name of the virtual kubelet node name
-// as well as remove any status fields of the downward apis env fields
-func AddPodMutatorWebhook(ctx context.Context, mgr manager.Manager, hostClient ctrlruntimeclient.Client, clusterName, clusterNamespace, nodeName, serviceName string, logger *log.Logger) error {
-	handler := webhookHandler{
-		client:           mgr.GetClient(),
-		scheme:           mgr.GetScheme(),
-		logger:           logger,
-		serviceName:      serviceName,
-		clusterName:      clusterName,
-		clusterNamespace: clusterNamespace,
-		nodeName:         nodeName,
-	}
-
-	// create mutator webhook configuration to the cluster
-	config, err := handler.configuration(ctx, hostClient)
-	if err != nil {
-		return err
-	}
-	if err := handler.client.Create(ctx, config); err != nil {
-		if !apierrors.IsAlreadyExists(err) {
-			return err
-		}
-	}
-	// register webhook with the manager
-	return ctrl.NewWebhookManagedBy(mgr).For(&v1.Pod{}).WithDefaulter(&handler).Complete()
-}
-
-func (w *webhookHandler) Default(ctx context.Context, obj runtime.Object) error {
-	pod, ok := obj.(*v1.Pod)
-	if !ok {
-		return fmt.Errorf("invalid request: object was type %t not cluster", obj)
-	}
-	w.logger.Infow("mutator webhook request", "Pod", pod.Name, "Namespace", pod.Namespace)
-	if pod.Spec.NodeName == "" {
-		pod.Spec.NodeName = w.nodeName
-	}
-	// look for status.* fields in the env
-	if pod.Annotations == nil {
-		pod.Annotations = make(map[string]string)
-	}
-	for i, container := range pod.Spec.Containers {
-		for j, env := range container.Env {
-			if env.ValueFrom == nil || env.ValueFrom.FieldRef == nil {
-				continue
-			}
-
-			fieldPath := env.ValueFrom.FieldRef.FieldPath
-			if strings.Contains(fieldPath, "status.") {
-				annotationKey := fmt.Sprintf("%s_%d_%s", FieldpathField, i, env.Name)
-				pod.Annotations[annotationKey] = fieldPath
-				pod.Spec.Containers[i].Env = removeEnv(pod.Spec.Containers[i].Env, j)
-			}
-		}
-	}
-	return nil
-}
-
-func (w *webhookHandler) configuration(ctx context.Context, hostClient ctrlruntimeclient.Client) (*admissionregistrationv1.MutatingWebhookConfiguration, error) {
-	w.logger.Infow("extracting webhook tls from host cluster")
-	var (
-		webhookTLSSecret v1.Secret
-	)
-	if err := hostClient.Get(ctx, types.NamespacedName{Name: agent.WebhookSecretName(w.clusterName), Namespace: w.clusterNamespace}, &webhookTLSSecret); err != nil {
-		return nil, err
-	}
-	caBundle, ok := webhookTLSSecret.Data["ca.crt"]
-	if !ok {
-		return nil, errors.New("webhook CABundle does not exist in secret")
-	}
-	webhookURL := "https://" + w.serviceName + ":" + webhookPort + webhookPath
-	return &admissionregistrationv1.MutatingWebhookConfiguration{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "admissionregistration.k8s.io/v1",
-			Kind:       "MutatingWebhookConfiguration",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: webhookName + "-configuration",
-		},
-		Webhooks: []admissionregistrationv1.MutatingWebhook{
-			{
-				Name:                    webhookName,
-				AdmissionReviewVersions: []string{"v1"},
-				SideEffects:             ptr.To(admissionregistrationv1.SideEffectClassNone),
-				TimeoutSeconds:          ptr.To(webhookTimeout),
-				ClientConfig: admissionregistrationv1.WebhookClientConfig{
-					URL:      ptr.To(webhookURL),
-					CABundle: caBundle,
-				},
-				Rules: []admissionregistrationv1.RuleWithOperations{
-					{
-						Operations: []admissionregistrationv1.OperationType{
-							"CREATE",
-						},
-						Rule: admissionregistrationv1.Rule{
-							APIGroups:   []string{""},
-							APIVersions: []string{"v1"},
-							Resources:   []string{"pods"},
-							Scope:       ptr.To(admissionregistrationv1.NamespacedScope),
-						},
-					},
-				},
-			},
-		},
-	}, nil
-}
-
-func removeEnv(envs []v1.EnvVar, i int) []v1.EnvVar {
-	envs[i] = envs[len(envs)-1]
-	return envs[:len(envs)-1]
-}
-
-func ParseFieldPathAnnotationKey(annotationKey string) (int, string, error) {
-	s := strings.SplitN(annotationKey, "_", 3)
-	if len(s) != 3 {
-		return -1, "", errors.New("fieldpath annotation is not set correctly")
-	}
-	containerIndex, err := strconv.Atoi(s[1])
-	if err != nil {
-		return -1, "", err
-	}
-	envName := s[2]
-
-	return containerIndex, envName, nil
-}

k3k-kubelet/kubelet.go

@@ -1,374 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"time"
-
-	certutil "github.com/rancher/dynamiclistener/cert"
-	k3kkubeletcontroller "github.com/rancher/k3k/k3k-kubelet/controller"
-	k3kwebhook "github.com/rancher/k3k/k3k-kubelet/controller/webhook"
-	"github.com/rancher/k3k/k3k-kubelet/provider"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/certs"
-	"github.com/rancher/k3k/pkg/controller/cluster/server"
-	"github.com/rancher/k3k/pkg/controller/cluster/server/bootstrap"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	"github.com/virtual-kubelet/virtual-kubelet/log"
-	"github.com/virtual-kubelet/virtual-kubelet/node"
-	"github.com/virtual-kubelet/virtual-kubelet/node/nodeutil"
-	"go.uber.org/zap"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/client-go/kubernetes"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/client-go/util/retry"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	ctrlserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-)
-
-var (
-	baseScheme     = runtime.NewScheme()
-	k3kKubeletName = "k3k-kubelet"
-)
-
-func init() {
-	_ = clientgoscheme.AddToScheme(baseScheme)
-	_ = v1alpha1.AddToScheme(baseScheme)
-}
-
-type kubelet struct {
-	virtualCluster v1alpha1.Cluster
-
-	name       string
-	port       int
-	hostConfig *rest.Config
-	virtConfig *rest.Config
-	agentIP    string
-	dnsIP      string
-	hostClient ctrlruntimeclient.Client
-	virtClient kubernetes.Interface
-	hostMgr    manager.Manager
-	virtualMgr manager.Manager
-	node       *nodeutil.Node
-	logger     *k3klog.Logger
-	token      string
-}
-
-func newKubelet(ctx context.Context, c *config, logger *k3klog.Logger) (*kubelet, error) {
-	hostConfig, err := clientcmd.BuildConfigFromFlags("", c.HostConfigPath)
-	if err != nil {
-		return nil, err
-	}
-
-	hostClient, err := ctrlruntimeclient.New(hostConfig, ctrlruntimeclient.Options{
-		Scheme: baseScheme,
-	})
-	if err != nil {
-		return nil, err
-	}
-	virtConfig, err := virtRestConfig(ctx, c.VirtualConfigPath, hostClient, c.ClusterName, c.ClusterNamespace, c.Token, logger)
-	if err != nil {
-		return nil, err
-	}
-
-	virtClient, err := kubernetes.NewForConfig(virtConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	hostMgr, err := ctrl.NewManager(hostConfig, manager.Options{
-		Scheme: baseScheme,
-		Metrics: ctrlserver.Options{
-			BindAddress: ":8083",
-		},
-		Cache: cache.Options{
-			DefaultNamespaces: map[string]cache.Config{
-				c.ClusterNamespace: {},
-			},
-		},
-	})
-	if err != nil {
-		return nil, errors.New("unable to create controller-runtime mgr for host cluster: " + err.Error())
-	}
-
-	virtualScheme := runtime.NewScheme()
-	// virtual client will only use core types (for now), no need to add anything other than the basics
-	err = clientgoscheme.AddToScheme(virtualScheme)
-	if err != nil {
-		return nil, errors.New("unable to add client go types to virtual cluster scheme: " + err.Error())
-	}
-	webhookServer := webhook.NewServer(webhook.Options{
-		CertDir: "/opt/rancher/k3k-webhook",
-	})
-	virtualMgr, err := ctrl.NewManager(virtConfig, manager.Options{
-		Scheme:        virtualScheme,
-		WebhookServer: webhookServer,
-		Metrics: ctrlserver.Options{
-			BindAddress: ":8084",
-		},
-	})
-	if err != nil {
-		return nil, errors.New("unable to create controller-runtime mgr for virtual cluster: " + err.Error())
-	}
-	logger.Info("adding pod mutator webhook")
-	if err := k3kwebhook.AddPodMutatorWebhook(ctx, virtualMgr, hostClient, c.ClusterName, c.ClusterNamespace, c.AgentHostname, c.ServiceName, logger); err != nil {
-		return nil, errors.New("unable to add pod mutator webhook for virtual cluster: " + err.Error())
-	}
-
-	logger.Info("adding service syncer controller")
-	if err := k3kkubeletcontroller.AddServiceSyncer(ctx, virtualMgr, hostMgr, c.ClusterName, c.ClusterNamespace, k3klog.New(false)); err != nil {
-		return nil, errors.New("failed to add service syncer controller: " + err.Error())
-	}
-
-	logger.Info("adding pvc syncer controller")
-	if err := k3kkubeletcontroller.AddPVCSyncer(ctx, virtualMgr, hostMgr, c.ClusterName, c.ClusterNamespace, k3klog.New(false)); err != nil {
-		return nil, errors.New("failed to add pvc syncer controller: " + err.Error())
-	}
-
-	clusterIP, err := clusterIP(ctx, c.ServiceName, c.ClusterNamespace, hostClient)
-	if err != nil {
-		return nil, errors.New("failed to extract the clusterIP for the server service: " + err.Error())
-	}
-
-	// get the cluster's DNS IP to be injected to pods
-	var dnsService v1.Service
-	dnsName := controller.SafeConcatNameWithPrefix(c.ClusterName, "kube-dns")
-	if err := hostClient.Get(ctx, types.NamespacedName{Name: dnsName, Namespace: c.ClusterNamespace}, &dnsService); err != nil {
-		return nil, errors.New("failed to get the DNS service for the cluster: " + err.Error())
-	}
-
-	var virtualCluster v1alpha1.Cluster
-	if err := hostClient.Get(ctx, types.NamespacedName{Name: c.ClusterName, Namespace: c.ClusterNamespace}, &virtualCluster); err != nil {
-		return nil, errors.New("failed to get virtualCluster spec: " + err.Error())
-	}
-
-	return &kubelet{
-		virtualCluster: virtualCluster,
-
-		name:       c.AgentHostname,
-		hostConfig: hostConfig,
-		hostClient: hostClient,
-		virtConfig: virtConfig,
-		virtClient: virtClient,
-		hostMgr:    hostMgr,
-		virtualMgr: virtualMgr,
-		agentIP:    clusterIP,
-		logger:     logger.Named(k3kKubeletName),
-		token:      c.Token,
-		dnsIP:      dnsService.Spec.ClusterIP,
-	}, nil
-}
-
-func clusterIP(ctx context.Context, serviceName, clusterNamespace string, hostClient ctrlruntimeclient.Client) (string, error) {
-	var service v1.Service
-	serviceKey := types.NamespacedName{Namespace: clusterNamespace, Name: serviceName}
-	if err := hostClient.Get(ctx, serviceKey, &service); err != nil {
-		return "", err
-	}
-	return service.Spec.ClusterIP, nil
-}
-
-func (k *kubelet) registerNode(ctx context.Context, agentIP, srvPort, namespace, name, hostname, serverIP, dnsIP, version string) error {
-	providerFunc := k.newProviderFunc(namespace, name, hostname, agentIP, serverIP, dnsIP, version)
-	nodeOpts := k.nodeOpts(ctx, srvPort, namespace, name, hostname, agentIP)
-
-	var err error
-	k.node, err = nodeutil.NewNode(k.name, providerFunc, nodeutil.WithClient(k.virtClient), nodeOpts)
-	if err != nil {
-		return errors.New("unable to start kubelet: " + err.Error())
-	}
-	return nil
-}
-
-func (k *kubelet) start(ctx context.Context) {
-	// any one of the following 3 tasks (host manager, virtual manager, node) crashing will stop the
-	// program, and all 3 of them block on start, so we start them here in go-routines
-	go func() {
-		err := k.hostMgr.Start(ctx)
-		if err != nil {
-			k.logger.Fatalw("host manager stopped", zap.Error(err))
-		}
-	}()
-
-	go func() {
-		err := k.virtualMgr.Start(ctx)
-		if err != nil {
-			k.logger.Fatalw("virtual manager stopped", zap.Error(err))
-		}
-	}()
-
-	// run the node async so that we can wait for it to be ready in another call
-
-	go func() {
-		ctx = log.WithLogger(ctx, k.logger)
-		if err := k.node.Run(ctx); err != nil {
-			k.logger.Fatalw("node errored when running", zap.Error(err))
-		}
-	}()
-
-	if err := k.node.WaitReady(context.Background(), time.Minute*1); err != nil {
-		k.logger.Fatalw("node was not ready within timeout of 1 minute", zap.Error(err))
-	}
-	<-k.node.Done()
-	if err := k.node.Err(); err != nil {
-		k.logger.Fatalw("node stopped with an error", zap.Error(err))
-	}
-	k.logger.Info("node exited successfully")
-}
-
-func (k *kubelet) newProviderFunc(namespace, name, hostname, agentIP, serverIP, dnsIP, version string) nodeutil.NewProviderFunc {
-	return func(pc nodeutil.ProviderConfig) (nodeutil.Provider, node.NodeProvider, error) {
-		utilProvider, err := provider.New(*k.hostConfig, k.hostMgr, k.virtualMgr, k.logger, namespace, name, serverIP, dnsIP)
-		if err != nil {
-			return nil, nil, errors.New("unable to make nodeutil provider: " + err.Error())
-		}
-
-		provider.ConfigureNode(k.logger, pc.Node, hostname, k.port, agentIP, utilProvider.CoreClient, utilProvider.VirtualClient, k.virtualCluster, version)
-
-		return utilProvider, &provider.Node{}, nil
-	}
-}
-
-func (k *kubelet) nodeOpts(ctx context.Context, srvPort, namespace, name, hostname, agentIP string) nodeutil.NodeOpt {
-	return func(c *nodeutil.NodeConfig) error {
-		c.HTTPListenAddr = fmt.Sprintf(":%s", srvPort)
-		// set up the routes
-		mux := http.NewServeMux()
-		if err := nodeutil.AttachProviderRoutes(mux)(c); err != nil {
-			return errors.New("unable to attach routes: " + err.Error())
-		}
-		c.Handler = mux
-
-		tlsConfig, err := loadTLSConfig(ctx, k.hostClient, name, namespace, k.name, hostname, k.token, agentIP)
-		if err != nil {
-			return errors.New("unable to get tls config: " + err.Error())
-		}
-		c.TLSConfig = tlsConfig
-		return nil
-	}
-}
-
-func virtRestConfig(ctx context.Context, virtualConfigPath string, hostClient ctrlruntimeclient.Client, clusterName, clusterNamespace, token string, logger *k3klog.Logger) (*rest.Config, error) {
-	if virtualConfigPath != "" {
-		return clientcmd.BuildConfigFromFlags("", virtualConfigPath)
-	}
-	// virtual kubeconfig file is empty, trying to fetch the k3k cluster kubeconfig
-	var cluster v1alpha1.Cluster
-	if err := hostClient.Get(ctx, types.NamespacedName{Namespace: clusterNamespace, Name: clusterName}, &cluster); err != nil {
-		return nil, err
-	}
-	endpoint := server.ServiceName(cluster.Name) + "." + cluster.Namespace
-	var b *bootstrap.ControlRuntimeBootstrap
-	if err := retry.OnError(controller.Backoff, func(err error) bool {
-		return err != nil
-	}, func() error {
-		var err error
-		b, err = bootstrap.DecodedBootstrap(token, endpoint)
-		logger.Infow("decoded bootstrap", zap.Error(err))
-		return err
-	}); err != nil {
-		return nil, errors.New("unable to decode bootstrap: " + err.Error())
-	}
-	adminCert, adminKey, err := certs.CreateClientCertKey(
-		controller.AdminCommonName, []string{user.SystemPrivilegedGroup},
-		nil, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}, time.Hour*24*time.Duration(356),
-		b.ClientCA.Content,
-		b.ClientCAKey.Content)
-	if err != nil {
-		return nil, err
-	}
-
-	url := fmt.Sprintf("https://%s:%d", server.ServiceName(cluster.Name), server.ServerPort)
-	kubeconfigData, err := kubeconfigBytes(url, []byte(b.ServerCA.Content), adminCert, adminKey)
-	if err != nil {
-		return nil, err
-	}
-	return clientcmd.RESTConfigFromKubeConfig(kubeconfigData)
-}
-
-func kubeconfigBytes(url string, serverCA, clientCert, clientKey []byte) ([]byte, error) {
-	config := clientcmdapi.NewConfig()
-
-	cluster := clientcmdapi.NewCluster()
-	cluster.CertificateAuthorityData = serverCA
-	cluster.Server = url
-
-	authInfo := clientcmdapi.NewAuthInfo()
-	authInfo.ClientCertificateData = clientCert
-	authInfo.ClientKeyData = clientKey
-
-	context := clientcmdapi.NewContext()
-	context.AuthInfo = "default"
-	context.Cluster = "default"
-
-	config.Clusters["default"] = cluster
-	config.AuthInfos["default"] = authInfo
-	config.Contexts["default"] = context
-	config.CurrentContext = "default"
-
-	return clientcmd.Write(*config)
-}
-
-func loadTLSConfig(ctx context.Context, hostClient ctrlruntimeclient.Client, clusterName, clusterNamespace, nodeName, hostname, token, agentIP string) (*tls.Config, error) {
-	var (
-		cluster v1alpha1.Cluster
-		b       *bootstrap.ControlRuntimeBootstrap
-	)
-	if err := hostClient.Get(ctx, types.NamespacedName{Name: clusterName, Namespace: clusterNamespace}, &cluster); err != nil {
-		return nil, err
-	}
-	endpoint := fmt.Sprintf("%s.%s", server.ServiceName(cluster.Name), cluster.Namespace)
-	if err := retry.OnError(controller.Backoff, func(err error) bool {
-		return err != nil
-	}, func() error {
-		var err error
-		b, err = bootstrap.DecodedBootstrap(token, endpoint)
-		return err
-	}); err != nil {
-		return nil, errors.New("unable to decode bootstrap: " + err.Error())
-	}
-	ip := net.ParseIP(agentIP)
-	altNames := certutil.AltNames{
-		DNSNames: []string{hostname},
-		IPs:      []net.IP{ip},
-	}
-	cert, key, err := certs.CreateClientCertKey(nodeName, nil, &altNames, []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, 0, b.ServerCA.Content, b.ServerCAKey.Content)
-	if err != nil {
-		return nil, errors.New("unable to get cert and key: " + err.Error())
-	}
-	clientCert, err := tls.X509KeyPair(cert, key)
-	if err != nil {
-		return nil, errors.New("unable to get key pair: " + err.Error())
-	}
-	// create rootCA CertPool
-	certs, err := certutil.ParseCertsPEM([]byte(b.ServerCA.Content))
-	if err != nil {
-		return nil, errors.New("unable to create ca certs: " + err.Error())
-	}
-	if len(certs) < 1 {
-		return nil, errors.New("ca cert is not parsed correctly")
-	}
-	pool := x509.NewCertPool()
-	pool.AddCert(certs[0])
-
-	return &tls.Config{
-		RootCAs:      pool,
-		Certificates: []tls.Certificate{clientCert},
-	}, nil
-}

k3k-kubelet/main.go

@@ -1,134 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-
-	"github.com/go-logr/zapr"
-	"github.com/rancher/k3k/pkg/log"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
-	"go.uber.org/zap"
-	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
-)
-
-var (
-	configFile string
-	cfg        config
-	logger     *log.Logger
-	debug      bool
-)
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "k3k-kubelet"
-	app.Usage = "virtual kubelet implementation k3k"
-	app.Flags = []cli.Flag{
-		&cli.StringFlag{
-			Name:        "cluster-name",
-			Usage:       "Name of the k3k cluster",
-			Destination: &cfg.ClusterName,
-			EnvVars:     []string{"CLUSTER_NAME"},
-		},
-		&cli.StringFlag{
-			Name:        "cluster-namespace",
-			Usage:       "Namespace of the k3k cluster",
-			Destination: &cfg.ClusterNamespace,
-			EnvVars:     []string{"CLUSTER_NAMESPACE"},
-		},
-		&cli.StringFlag{
-			Name:        "cluster-token",
-			Usage:       "K3S token of the k3k cluster",
-			Destination: &cfg.Token,
-			EnvVars:     []string{"CLUSTER_TOKEN"},
-		},
-		&cli.StringFlag{
-			Name:        "host-config-path",
-			Usage:       "Path to the host kubeconfig, if empty then virtual-kubelet will use incluster config",
-			Destination: &cfg.HostConfigPath,
-			EnvVars:     []string{"HOST_KUBECONFIG"},
-		},
-		&cli.StringFlag{
-			Name:        "virtual-config-path",
-			Usage:       "Path to the k3k cluster kubeconfig, if empty then virtual-kubelet will create its own config from k3k cluster",
-			Destination: &cfg.VirtualConfigPath,
-			EnvVars:     []string{"CLUSTER_NAME"},
-		},
-		&cli.StringFlag{
-			Name:        "kubelet-port",
-			Usage:       "kubelet API port number",
-			Destination: &cfg.KubeletPort,
-			EnvVars:     []string{"SERVER_PORT"},
-			Value:       "10250",
-		},
-		&cli.StringFlag{
-			Name:        "service-name",
-			Usage:       "The service name deployed by the k3k controller",
-			Destination: &cfg.ServiceName,
-			EnvVars:     []string{"SERVICE_NAME"},
-		},
-		&cli.StringFlag{
-			Name:        "agent-hostname",
-			Usage:       "Agent Hostname used for TLS SAN for the kubelet server",
-			Destination: &cfg.AgentHostname,
-			EnvVars:     []string{"AGENT_HOSTNAME"},
-		},
-		&cli.StringFlag{
-			Name:        "server-ip",
-			Usage:       "Server IP used for registering the virtual kubelet to the cluster",
-			Destination: &cfg.ServerIP,
-			EnvVars:     []string{"SERVER_IP"},
-		},
-		&cli.StringFlag{
-			Name:        "version",
-			Usage:       "Version of kubernetes server",
-			Destination: &cfg.Version,
-			EnvVars:     []string{"VERSION"},
-		},
-		&cli.StringFlag{
-			Name:        "config",
-			Usage:       "Path to k3k-kubelet config file",
-			Destination: &configFile,
-			EnvVars:     []string{"CONFIG_FILE"},
-			Value:       "/etc/rancher/k3k/config.yaml",
-		},
-		&cli.BoolFlag{
-			Name:        "debug",
-			Usage:       "Enable debug logging",
-			Destination: &debug,
-			EnvVars:     []string{"DEBUG"},
-		},
-	}
-	app.Before = func(clx *cli.Context) error {
-		logger = log.New(debug)
-		ctrlruntimelog.SetLogger(zapr.NewLogger(logger.Desugar().WithOptions(zap.AddCallerSkip(1))))
-		return nil
-	}
-	app.Action = run
-	if err := app.Run(os.Args); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-func run(clx *cli.Context) error {
-	ctx := context.Background()
-	if err := cfg.parse(configFile); err != nil {
-		logger.Fatalw("failed to parse config file", "path", configFile, zap.Error(err))
-	}
-
-	if err := cfg.validate(); err != nil {
-		logger.Fatalw("failed to validate config", zap.Error(err))
-	}
-	k, err := newKubelet(ctx, &cfg, logger)
-	if err != nil {
-		logger.Fatalw("failed to create new virtual kubelet instance", zap.Error(err))
-	}
-
-	if err := k.registerNode(ctx, k.agentIP, cfg.KubeletPort, cfg.ClusterNamespace, cfg.ClusterName, cfg.AgentHostname, cfg.ServerIP, k.dnsIP, cfg.Version); err != nil {
-		logger.Fatalw("failed to register new node", zap.Error(err))
-	}
-
-	k.start(ctx)
-
-	return nil
-}

k3k-kubelet/provider/collectors/kubelet_resource_metrics.go

@@ -1,196 +0,0 @@
-/*
-Copyright (c) Microsoft Corporation.
-Licensed under the Apache 2.0 license.
-
-See https://github.com/virtual-kubelet/azure-aci/tree/master/pkg/metrics/collectors
-*/
-
-package collectors
-
-import (
-	"time"
-
-	stats "github.com/virtual-kubelet/virtual-kubelet/node/api/statsv1alpha1"
-	compbasemetrics "k8s.io/component-base/metrics"
-)
-
-// defining metrics
-var (
-	nodeCPUUsageDesc = compbasemetrics.NewDesc("node_cpu_usage_seconds_total",
-		"Cumulative cpu time consumed by the node in core-seconds",
-		nil,
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	nodeMemoryUsageDesc = compbasemetrics.NewDesc("node_memory_working_set_bytes",
-		"Current working set of the node in bytes",
-		nil,
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	containerCPUUsageDesc = compbasemetrics.NewDesc("container_cpu_usage_seconds_total",
-		"Cumulative cpu time consumed by the container in core-seconds",
-		[]string{"container", "pod", "namespace"},
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	containerMemoryUsageDesc = compbasemetrics.NewDesc("container_memory_working_set_bytes",
-		"Current working set of the container in bytes",
-		[]string{"container", "pod", "namespace"},
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	podCPUUsageDesc = compbasemetrics.NewDesc("pod_cpu_usage_seconds_total",
-		"Cumulative cpu time consumed by the pod in core-seconds",
-		[]string{"pod", "namespace"},
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	podMemoryUsageDesc = compbasemetrics.NewDesc("pod_memory_working_set_bytes",
-		"Current working set of the pod in bytes",
-		[]string{"pod", "namespace"},
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	resourceScrapeResultDesc = compbasemetrics.NewDesc("scrape_error",
-		"1 if there was an error while getting container metrics, 0 otherwise",
-		nil,
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-
-	containerStartTimeDesc = compbasemetrics.NewDesc("container_start_time_seconds",
-		"Start time of the container since unix epoch in seconds",
-		[]string{"container", "pod", "namespace"},
-		nil,
-		compbasemetrics.ALPHA,
-		"")
-)
-
-// NewResourceMetricsCollector returns a metrics.StableCollector which exports resource metrics
-func NewKubeletResourceMetricsCollector(podStats *stats.Summary) compbasemetrics.StableCollector {
-	return &resourceMetricsCollector{
-		providerPodStats: podStats,
-	}
-}
-
-type resourceMetricsCollector struct {
-	compbasemetrics.BaseStableCollector
-
-	providerPodStats *stats.Summary
-}
-
-// Check if resourceMetricsCollector implements necessary interface
-var _ compbasemetrics.StableCollector = &resourceMetricsCollector{}
-
-// DescribeWithStability implements compbasemetrics.StableCollector
-func (rc *resourceMetricsCollector) DescribeWithStability(ch chan<- *compbasemetrics.Desc) {
-	ch <- nodeCPUUsageDesc
-	ch <- nodeMemoryUsageDesc
-	ch <- containerStartTimeDesc
-	ch <- containerCPUUsageDesc
-	ch <- containerMemoryUsageDesc
-	ch <- podCPUUsageDesc
-	ch <- podMemoryUsageDesc
-	ch <- resourceScrapeResultDesc
-}
-
-// CollectWithStability implements compbasemetrics.StableCollector
-// Since new containers are frequently created and removed, using the Gauge would
-// leak metric collectors for containers or pods that no longer exist.  Instead, implement
-// custom collector in a way that only collects metrics for active containers.
-func (rc *resourceMetricsCollector) CollectWithStability(ch chan<- compbasemetrics.Metric) {
-	var errorCount float64
-	defer func() {
-		ch <- compbasemetrics.NewLazyConstMetric(resourceScrapeResultDesc, compbasemetrics.GaugeValue, errorCount)
-	}()
-
-	statsSummary := *rc.providerPodStats
-	rc.collectNodeCPUMetrics(ch, statsSummary.Node)
-	rc.collectNodeMemoryMetrics(ch, statsSummary.Node)
-
-	for _, pod := range statsSummary.Pods {
-		for _, container := range pod.Containers {
-			rc.collectContainerStartTime(ch, pod, container)
-			rc.collectContainerCPUMetrics(ch, pod, container)
-			rc.collectContainerMemoryMetrics(ch, pod, container)
-		}
-		rc.collectPodCPUMetrics(ch, pod)
-		rc.collectPodMemoryMetrics(ch, pod)
-	}
-}
-
-// implement collector methods and validate that correct data is used
-
-func (rc *resourceMetricsCollector) collectNodeCPUMetrics(ch chan<- compbasemetrics.Metric, s stats.NodeStats) {
-	if s.CPU == nil || s.CPU.UsageCoreNanoSeconds == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(s.CPU.Time.Time,
-		compbasemetrics.NewLazyConstMetric(nodeCPUUsageDesc, compbasemetrics.CounterValue, float64(*s.CPU.UsageCoreNanoSeconds)/float64(time.Second)))
-}
-
-func (rc *resourceMetricsCollector) collectNodeMemoryMetrics(ch chan<- compbasemetrics.Metric, s stats.NodeStats) {
-	if s.Memory == nil || s.Memory.WorkingSetBytes == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(s.Memory.Time.Time,
-		compbasemetrics.NewLazyConstMetric(nodeMemoryUsageDesc, compbasemetrics.GaugeValue, float64(*s.Memory.WorkingSetBytes)))
-}
-
-func (rc *resourceMetricsCollector) collectContainerStartTime(ch chan<- compbasemetrics.Metric, pod stats.PodStats, s stats.ContainerStats) {
-	if s.StartTime.Unix() <= 0 {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(s.StartTime.Time,
-		compbasemetrics.NewLazyConstMetric(containerStartTimeDesc, compbasemetrics.GaugeValue, float64(s.StartTime.UnixNano())/float64(time.Second), s.Name, pod.PodRef.Name, pod.PodRef.Namespace))
-}
-
-func (rc *resourceMetricsCollector) collectContainerCPUMetrics(ch chan<- compbasemetrics.Metric, pod stats.PodStats, s stats.ContainerStats) {
-	if s.CPU == nil || s.CPU.UsageCoreNanoSeconds == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(s.CPU.Time.Time,
-		compbasemetrics.NewLazyConstMetric(containerCPUUsageDesc, compbasemetrics.CounterValue,
-			float64(*s.CPU.UsageCoreNanoSeconds)/float64(time.Second), s.Name, pod.PodRef.Name, pod.PodRef.Namespace))
-}
-
-func (rc *resourceMetricsCollector) collectContainerMemoryMetrics(ch chan<- compbasemetrics.Metric, pod stats.PodStats, s stats.ContainerStats) {
-	if s.Memory == nil || s.Memory.WorkingSetBytes == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(s.Memory.Time.Time,
-		compbasemetrics.NewLazyConstMetric(containerMemoryUsageDesc, compbasemetrics.GaugeValue,
-			float64(*s.Memory.WorkingSetBytes), s.Name, pod.PodRef.Name, pod.PodRef.Namespace))
-}
-
-func (rc *resourceMetricsCollector) collectPodCPUMetrics(ch chan<- compbasemetrics.Metric, pod stats.PodStats) {
-	if pod.CPU == nil || pod.CPU.UsageCoreNanoSeconds == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(pod.CPU.Time.Time,
-		compbasemetrics.NewLazyConstMetric(podCPUUsageDesc, compbasemetrics.CounterValue,
-			float64(*pod.CPU.UsageCoreNanoSeconds)/float64(time.Second), pod.PodRef.Name, pod.PodRef.Namespace))
-}
-
-func (rc *resourceMetricsCollector) collectPodMemoryMetrics(ch chan<- compbasemetrics.Metric, pod stats.PodStats) {
-	if pod.Memory == nil || pod.Memory.WorkingSetBytes == nil {
-		return
-	}
-
-	ch <- compbasemetrics.NewLazyMetricWithTimestamp(pod.Memory.Time.Time,
-		compbasemetrics.NewLazyConstMetric(podMemoryUsageDesc, compbasemetrics.GaugeValue,
-			float64(*pod.Memory.WorkingSetBytes), pod.PodRef.Name, pod.PodRef.Namespace))
-}

k3k-kubelet/provider/configure.go

@@ -1,167 +0,0 @@
-package provider
-
-import (
-	"context"
-	"time"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/types"
-	typedv1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func ConfigureNode(logger *k3klog.Logger, node *v1.Node, hostname string, servicePort int, ip string, coreClient typedv1.CoreV1Interface, virtualClient client.Client, virtualCluster v1alpha1.Cluster, version string) {
-	node.Status.Conditions = nodeConditions()
-	node.Status.DaemonEndpoints.KubeletEndpoint.Port = int32(servicePort)
-	node.Status.Addresses = []v1.NodeAddress{
-		{
-			Type:    v1.NodeHostName,
-			Address: hostname,
-		},
-		{
-			Type:    v1.NodeInternalIP,
-			Address: ip,
-		},
-	}
-
-	node.Labels["node.kubernetes.io/exclude-from-external-load-balancers"] = "true"
-	node.Labels["kubernetes.io/os"] = "linux"
-
-	// configure versions
-	node.Status.NodeInfo.KubeletVersion = version
-	node.Status.NodeInfo.KubeProxyVersion = version
-
-	updateNodeCapacityInterval := 10 * time.Second
-	ticker := time.NewTicker(updateNodeCapacityInterval)
-
-	go func() {
-		for range ticker.C {
-			if err := updateNodeCapacity(coreClient, virtualClient, node.Name, virtualCluster.Spec.NodeSelector); err != nil {
-				logger.Error("error updating node capacity", err)
-			}
-		}
-	}()
-}
-
-// nodeConditions returns the basic conditions which mark the node as ready
-func nodeConditions() []v1.NodeCondition {
-	return []v1.NodeCondition{
-		{
-			Type:               "Ready",
-			Status:             v1.ConditionTrue,
-			LastHeartbeatTime:  metav1.Now(),
-			LastTransitionTime: metav1.Now(),
-			Reason:             "KubeletReady",
-			Message:            "kubelet is ready.",
-		},
-		{
-			Type:               "OutOfDisk",
-			Status:             v1.ConditionFalse,
-			LastHeartbeatTime:  metav1.Now(),
-			LastTransitionTime: metav1.Now(),
-			Reason:             "KubeletHasSufficientDisk",
-			Message:            "kubelet has sufficient disk space available",
-		},
-		{
-			Type:               "MemoryPressure",
-			Status:             v1.ConditionFalse,
-			LastHeartbeatTime:  metav1.Now(),
-			LastTransitionTime: metav1.Now(),
-			Reason:             "KubeletHasSufficientMemory",
-			Message:            "kubelet has sufficient memory available",
-		},
-		{
-			Type:               "DiskPressure",
-			Status:             v1.ConditionFalse,
-			LastHeartbeatTime:  metav1.Now(),
-			LastTransitionTime: metav1.Now(),
-			Reason:             "KubeletHasNoDiskPressure",
-			Message:            "kubelet has no disk pressure",
-		},
-		{
-			Type:               "NetworkUnavailable",
-			Status:             v1.ConditionFalse,
-			LastHeartbeatTime:  metav1.Now(),
-			LastTransitionTime: metav1.Now(),
-			Reason:             "RouteCreated",
-			Message:            "RouteController created a route",
-		},
-	}
-}
-
-// updateNodeCapacity will update the virtual node capacity (and the allocatable field) with the sum of all the resource in the host nodes.
-// If the nodeLabels are specified only the matching nodes will be considered.
-func updateNodeCapacity(coreClient typedv1.CoreV1Interface, virtualClient client.Client, virtualNodeName string, nodeLabels map[string]string) error {
-	ctx := context.Background()
-
-	capacity, allocatable, err := getResourcesFromNodes(ctx, coreClient, nodeLabels)
-	if err != nil {
-		return err
-	}
-
-	var virtualNode corev1.Node
-	if err := virtualClient.Get(ctx, types.NamespacedName{Name: virtualNodeName}, &virtualNode); err != nil {
-		return err
-	}
-
-	virtualNode.Status.Capacity = capacity
-	virtualNode.Status.Allocatable = allocatable
-
-	return virtualClient.Status().Update(ctx, &virtualNode)
-}
-
-// getResourcesFromNodes will return a sum of all the resource capacity of the host nodes, and the allocatable resources.
-// If some node labels are specified only the matching nodes will be considered.
-func getResourcesFromNodes(ctx context.Context, coreClient typedv1.CoreV1Interface, nodeLabels map[string]string) (v1.ResourceList, v1.ResourceList, error) {
-	listOpts := metav1.ListOptions{}
-	if nodeLabels != nil {
-		labelSelector := metav1.LabelSelector{MatchLabels: nodeLabels}
-		listOpts.LabelSelector = labels.Set(labelSelector.MatchLabels).String()
-	}
-
-	nodeList, err := coreClient.Nodes().List(ctx, listOpts)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// sum all
-	virtualCapacityResources := corev1.ResourceList{}
-	virtualAvailableResources := corev1.ResourceList{}
-
-	for _, node := range nodeList.Items {
-
-		// check if the node is Ready
-		for _, condition := range node.Status.Conditions {
-			if condition.Type != corev1.NodeReady {
-				continue
-			}
-
-			// if the node is not Ready then we can skip it
-			if condition.Status != corev1.ConditionTrue {
-				break
-			}
-		}
-
-		// add all the available metrics to the virtual node
-		for resourceName, resourceQuantity := range node.Status.Capacity {
-			virtualResource := virtualCapacityResources[resourceName]
-
-			(&virtualResource).Add(resourceQuantity)
-			virtualCapacityResources[resourceName] = virtualResource
-		}
-
-		for resourceName, resourceQuantity := range node.Status.Allocatable {
-			virtualResource := virtualAvailableResources[resourceName]
-
-			(&virtualResource).Add(resourceQuantity)
-			virtualAvailableResources[resourceName] = virtualResource
-		}
-	}
-
-	return virtualCapacityResources, virtualAvailableResources, nil
-}

k3k-kubelet/provider/node.go

@@ -1,22 +0,0 @@
-package provider
-
-import (
-	"context"
-
-	corev1 "k8s.io/api/core/v1"
-)
-
-// Node implements the node.Provider interface from Virtual Kubelet
-type Node struct {
-	notifyCallback func(*corev1.Node)
-}
-
-// Ping is called to check if the node is healthy - in the current format it always is
-func (n *Node) Ping(context.Context) error {
-	return nil
-}
-
-// NotifyNodeStatus sets the callback function for a node being changed. As of now, no changes are made
-func (n *Node) NotifyNodeStatus(ctx context.Context, cb func(*corev1.Node)) {
-	n.notifyCallback = cb
-}

k3k-kubelet/provider/provider.go

@@ -1,878 +0,0 @@
-package provider
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	dto "github.com/prometheus/client_model/go"
-	"github.com/rancher/k3k/k3k-kubelet/controller"
-	"github.com/rancher/k3k/k3k-kubelet/controller/webhook"
-	"github.com/rancher/k3k/k3k-kubelet/provider/collectors"
-	"github.com/rancher/k3k/k3k-kubelet/translate"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	k3klog "github.com/rancher/k3k/pkg/log"
-	"github.com/virtual-kubelet/virtual-kubelet/node/api"
-	"github.com/virtual-kubelet/virtual-kubelet/node/api/statsv1alpha1"
-	"github.com/virtual-kubelet/virtual-kubelet/node/nodeutil"
-	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/selection"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/kubernetes/scheme"
-	cv1 "k8s.io/client-go/kubernetes/typed/core/v1"
-
-	"errors"
-
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/portforward"
-	"k8s.io/client-go/tools/remotecommand"
-	"k8s.io/client-go/transport/spdy"
-	compbasemetrics "k8s.io/component-base/metrics"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-)
-
-// check at compile time if the Provider implements the nodeutil.Provider interface
-var _ nodeutil.Provider = (*Provider)(nil)
-
-// Provider implements nodetuil.Provider from virtual Kubelet.
-// TODO: Implement NotifyPods and the required usage so that this can be an async provider
-type Provider struct {
-	Handler          controller.ControllerHandler
-	Translator       translate.ToHostTranslator
-	HostClient       client.Client
-	VirtualClient    client.Client
-	ClientConfig     rest.Config
-	CoreClient       cv1.CoreV1Interface
-	ClusterNamespace string
-	ClusterName      string
-	serverIP         string
-	dnsIP            string
-	logger           *k3klog.Logger
-}
-
-var (
-	ErrRetryTimeout = errors.New("provider timed out")
-)
-
-func New(hostConfig rest.Config, hostMgr, virtualMgr manager.Manager, logger *k3klog.Logger, namespace, name, serverIP, dnsIP string) (*Provider, error) {
-	coreClient, err := cv1.NewForConfig(&hostConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	translator := translate.ToHostTranslator{
-		ClusterName:      name,
-		ClusterNamespace: namespace,
-	}
-
-	p := Provider{
-		Handler: controller.ControllerHandler{
-			Mgr:           virtualMgr,
-			Scheme:        *virtualMgr.GetScheme(),
-			HostClient:    hostMgr.GetClient(),
-			VirtualClient: virtualMgr.GetClient(),
-			Translator:    translator,
-			Logger:        logger,
-		},
-		HostClient:       hostMgr.GetClient(),
-		VirtualClient:    virtualMgr.GetClient(),
-		Translator:       translator,
-		ClientConfig:     hostConfig,
-		CoreClient:       coreClient,
-		ClusterNamespace: namespace,
-		ClusterName:      name,
-		logger:           logger,
-		serverIP:         serverIP,
-		dnsIP:            dnsIP,
-	}
-
-	return &p, nil
-}
-
-// GetContainerLogs retrieves the logs of a container by name from the provider.
-func (p *Provider) GetContainerLogs(ctx context.Context, namespace, podName, containerName string, opts api.ContainerLogOpts) (io.ReadCloser, error) {
-	hostPodName := p.Translator.TranslateName(namespace, podName)
-	options := corev1.PodLogOptions{
-		Container:  containerName,
-		Timestamps: opts.Timestamps,
-		Follow:     opts.Follow,
-		Previous:   opts.Previous,
-	}
-	if opts.Tail != 0 {
-		tailLines := int64(opts.Tail)
-		options.TailLines = &tailLines
-	}
-	if opts.LimitBytes != 0 {
-		limitBytes := int64(opts.LimitBytes)
-		options.LimitBytes = &limitBytes
-	}
-	if opts.SinceSeconds != 0 {
-		sinceSeconds := int64(opts.SinceSeconds)
-		options.SinceSeconds = &sinceSeconds
-	}
-	if !opts.SinceTime.IsZero() {
-		sinceTime := metav1.NewTime(opts.SinceTime)
-		options.SinceTime = &sinceTime
-	}
-	closer, err := p.CoreClient.Pods(p.ClusterNamespace).GetLogs(hostPodName, &options).Stream(ctx)
-	p.logger.Infof("got error %s when getting logs for %s in %s", err, hostPodName, p.ClusterNamespace)
-	return closer, err
-}
-
-// RunInContainer executes a command in a container in the pod, copying data
-// between in/out/err and the container's stdin/stdout/stderr.
-func (p *Provider) RunInContainer(ctx context.Context, namespace, podName, containerName string, cmd []string, attach api.AttachIO) error {
-	hostPodName := p.Translator.TranslateName(namespace, podName)
-	req := p.CoreClient.RESTClient().Post().
-		Resource("pods").
-		Name(hostPodName).
-		Namespace(p.ClusterNamespace).
-		SubResource("exec")
-	req.VersionedParams(&corev1.PodExecOptions{
-		Container: containerName,
-		Command:   cmd,
-		TTY:       attach.TTY(),
-		Stdin:     attach.Stdin() != nil,
-		Stdout:    attach.Stdout() != nil,
-		Stderr:    attach.Stderr() != nil,
-	}, scheme.ParameterCodec)
-	exec, err := remotecommand.NewSPDYExecutor(&p.ClientConfig, http.MethodPost, req.URL())
-	if err != nil {
-		return err
-	}
-	return exec.StreamWithContext(ctx, remotecommand.StreamOptions{
-		Stdin:  attach.Stdin(),
-		Stdout: attach.Stdout(),
-		Stderr: attach.Stderr(),
-		Tty:    attach.TTY(),
-		TerminalSizeQueue: &translatorSizeQueue{
-			resizeChan: attach.Resize(),
-		},
-	})
-}
-
-// AttachToContainer attaches to the executing process of a container in the pod, copying data
-// between in/out/err and the container's stdin/stdout/stderr.
-func (p *Provider) AttachToContainer(ctx context.Context, namespace, podName, containerName string, attach api.AttachIO) error {
-	hostPodName := p.Translator.TranslateName(namespace, podName)
-	req := p.CoreClient.RESTClient().Post().
-		Resource("pods").
-		Name(hostPodName).
-		Namespace(p.ClusterNamespace).
-		SubResource("attach")
-	req.VersionedParams(&corev1.PodAttachOptions{
-		Container: containerName,
-		TTY:       attach.TTY(),
-		Stdin:     attach.Stdin() != nil,
-		Stdout:    attach.Stdout() != nil,
-		Stderr:    attach.Stderr() != nil,
-	}, scheme.ParameterCodec)
-	exec, err := remotecommand.NewSPDYExecutor(&p.ClientConfig, http.MethodPost, req.URL())
-	if err != nil {
-		return err
-	}
-	return exec.StreamWithContext(ctx, remotecommand.StreamOptions{
-		Stdin:  attach.Stdin(),
-		Stdout: attach.Stdout(),
-		Stderr: attach.Stderr(),
-		Tty:    attach.TTY(),
-		TerminalSizeQueue: &translatorSizeQueue{
-			resizeChan: attach.Resize(),
-		},
-	})
-}
-
-// GetStatsSummary gets the stats for the node, including running pods
-func (p *Provider) GetStatsSummary(ctx context.Context) (*statsv1alpha1.Summary, error) {
-	p.logger.Debug("GetStatsSummary")
-
-	nodeList := &v1.NodeList{}
-	if err := p.CoreClient.RESTClient().Get().Resource("nodes").Do(ctx).Into(nodeList); err != nil {
-		return nil, fmt.Errorf("unable to get nodes of cluster %s in namespace %s: %w", p.ClusterName, p.ClusterNamespace, err)
-	}
-
-	// fetch the stats from all the nodes
-	var nodeStats statsv1alpha1.NodeStats
-	var allPodsStats []statsv1alpha1.PodStats
-
-	for _, n := range nodeList.Items {
-		res, err := p.CoreClient.RESTClient().
-			Get().
-			Resource("nodes").
-			Name(n.Name).
-			SubResource("proxy").
-			Suffix("stats/summary").
-			DoRaw(ctx)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"unable to get stats of node '%s', from cluster %s in namespace %s: %w",
-				n.Name, p.ClusterName, p.ClusterNamespace, err,
-			)
-		}
-
-		stats := &statsv1alpha1.Summary{}
-		if err := json.Unmarshal(res, stats); err != nil {
-			return nil, err
-		}
-
-		// TODO: we should probably calculate somehow the node stats from the different nodes of the host
-		// or reflect different nodes from the virtual kubelet.
-		// For the moment let's just pick one random node stats.
-		nodeStats = stats.Node
-		allPodsStats = append(allPodsStats, stats.Pods...)
-	}
-
-	pods, err := p.GetPods(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	podsNameMap := make(map[string]*v1.Pod)
-	for _, pod := range pods {
-		hostPodName := p.Translator.TranslateName(pod.Namespace, pod.Name)
-		podsNameMap[hostPodName] = pod
-	}
-
-	filteredStats := &statsv1alpha1.Summary{
-		Node: nodeStats,
-		Pods: make([]statsv1alpha1.PodStats, 0),
-	}
-
-	for _, podStat := range allPodsStats {
-		// skip pods that are not in the cluster namespace
-		if podStat.PodRef.Namespace != p.ClusterNamespace {
-			continue
-		}
-
-		// rewrite the PodReference to match the data of the virtual cluster
-		if pod, found := podsNameMap[podStat.PodRef.Name]; found {
-			podStat.PodRef = statsv1alpha1.PodReference{
-				Name:      pod.Name,
-				Namespace: pod.Namespace,
-				UID:       string(pod.UID),
-			}
-			filteredStats.Pods = append(filteredStats.Pods, podStat)
-		}
-	}
-
-	return filteredStats, nil
-}
-
-// GetMetricsResource gets the metrics for the node, including running pods
-func (p *Provider) GetMetricsResource(ctx context.Context) ([]*dto.MetricFamily, error) {
-	statsSummary, err := p.GetStatsSummary(ctx)
-	if err != nil {
-		return nil, errors.Join(err, errors.New("error fetching MetricsResource"))
-	}
-
-	registry := compbasemetrics.NewKubeRegistry()
-	registry.CustomMustRegister(collectors.NewKubeletResourceMetricsCollector(statsSummary))
-
-	metricFamily, err := registry.Gather()
-	if err != nil {
-		return nil, errors.Join(err, errors.New("error gathering metrics from collector"))
-	}
-	return metricFamily, nil
-}
-
-// PortForward forwards a local port to a port on the pod
-func (p *Provider) PortForward(ctx context.Context, namespace, pod string, port int32, stream io.ReadWriteCloser) error {
-	hostPodName := p.Translator.TranslateName(namespace, pod)
-	req := p.CoreClient.RESTClient().Post().
-		Resource("pods").
-		Name(hostPodName).
-		Namespace(p.ClusterNamespace).
-		SubResource("portforward")
-
-	transport, upgrader, err := spdy.RoundTripperFor(&p.ClientConfig)
-	if err != nil {
-		return err
-	}
-	dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, http.MethodPost, req.URL())
-	portAsString := strconv.Itoa(int(port))
-
-	readyChannel := make(chan struct{})
-	stopChannel := make(chan struct{}, 1)
-
-	// Today this doesn't work properly. When the port ward is supposed to stop, the caller (this provider)
-	// should send a value on stopChannel so that the PortForward is stopped. However, we only have a ReadWriteCloser
-	// so more work is needed to detect a close and handle that appropriately.
-	fw, err := portforward.New(dialer, []string{portAsString}, stopChannel, readyChannel, stream, stream)
-
-	if err != nil {
-		return err
-	}
-
-	return fw.ForwardPorts()
-}
-
-// CreatePod executes createPod with retry
-func (p *Provider) CreatePod(ctx context.Context, pod *corev1.Pod) error {
-	return p.withRetry(ctx, p.createPod, pod)
-}
-
-// createPod takes a Kubernetes Pod and deploys it within the provider.
-func (p *Provider) createPod(ctx context.Context, pod *corev1.Pod) error {
-	tPod := pod.DeepCopy()
-	p.Translator.TranslateTo(tPod)
-
-	// get Cluster definition
-	clusterKey := types.NamespacedName{
-		Namespace: p.ClusterNamespace,
-		Name:      p.ClusterName,
-	}
-	var cluster v1alpha1.Cluster
-	if err := p.HostClient.Get(ctx, clusterKey, &cluster); err != nil {
-		return fmt.Errorf("unable to get cluster %s in namespace %s: %w", p.ClusterName, p.ClusterNamespace, err)
-	}
-
-	// these values shouldn't be set on create
-	tPod.UID = ""
-	tPod.ResourceVersion = ""
-
-	// the node was scheduled on the virtual kubelet, but leaving it this way will make it pending indefinitely
-	tPod.Spec.NodeName = ""
-
-	tPod.Spec.NodeSelector = cluster.Spec.NodeSelector
-
-	// setting the hostname for the pod if its not set
-	if pod.Spec.Hostname == "" {
-		tPod.Spec.Hostname = pod.Name
-	}
-
-	// if the priorityCluss for the virtual cluster is set then override the provided value
-	// Note: the core-dns and local-path-provisioner pod are scheduled by k3s with the
-	// 'system-cluster-critical' and 'system-node-critical' default priority classes.
-	if cluster.Spec.PriorityClass != "" {
-		tPod.Spec.PriorityClassName = cluster.Spec.PriorityClass
-		tPod.Spec.Priority = nil
-	}
-
-	// fieldpath annotations
-	if err := p.configureFieldPathEnv(pod, tPod); err != nil {
-		return fmt.Errorf("unable to fetch fieldpath annotations for pod %s/%s: %w", pod.Namespace, pod.Name, err)
-	}
-	// volumes will often refer to resources in the virtual cluster, but instead need to refer to the sync'd
-	// host cluster version
-	if err := p.transformVolumes(ctx, pod.Namespace, tPod.Spec.Volumes); err != nil {
-		return fmt.Errorf("unable to sync volumes for pod %s/%s: %w", pod.Namespace, pod.Name, err)
-	}
-	// sync serviceaccount token to a the host cluster
-	if err := p.transformTokens(ctx, pod, tPod); err != nil {
-		return fmt.Errorf("unable to transform tokens for pod %s/%s: %w", pod.Namespace, pod.Name, err)
-	}
-	// inject networking information to the pod including the virtual cluster controlplane endpoint
-	p.configureNetworking(pod.Name, pod.Namespace, tPod, p.serverIP)
-
-	p.logger.Infow("Creating pod", "Host Namespace", tPod.Namespace, "Host Name", tPod.Name,
-		"Virtual Namespace", pod.Namespace, "Virtual Name", "env", pod.Name, pod.Spec.Containers[0].Env)
-	return p.HostClient.Create(ctx, tPod)
-}
-
-// withRetry retries passed function with interval and timeout
-func (p *Provider) withRetry(ctx context.Context, f func(context.Context, *v1.Pod) error, pod *v1.Pod) error {
-	const (
-		interval = 2 * time.Second
-		timeout  = 10 * time.Second
-	)
-	var allErrors error
-	// retryFn will retry until the operation succeed, or the timeout occurs
-	retryFn := func(ctx context.Context) (bool, error) {
-		if lastErr := f(ctx, pod); lastErr != nil {
-			// log that the retry failed?
-			allErrors = errors.Join(allErrors, lastErr)
-			return false, nil
-		}
-		return true, nil
-	}
-	if err := wait.PollUntilContextTimeout(ctx, interval, timeout, true, retryFn); err != nil {
-		return errors.Join(allErrors, ErrRetryTimeout)
-	}
-	return nil
-}
-
-// transformVolumes changes the volumes to the representation in the host cluster. Will return an error
-// if one/more volumes couldn't be transformed
-func (p *Provider) transformVolumes(ctx context.Context, podNamespace string, volumes []corev1.Volume) error {
-	for _, volume := range volumes {
-		var optional bool
-		if strings.HasPrefix(volume.Name, kubeAPIAccessPrefix) {
-			continue
-		}
-		// note: this needs to handle downward api volumes as well, but more thought is needed on how to do that
-		if volume.ConfigMap != nil {
-			if volume.ConfigMap.Optional != nil {
-				optional = *volume.ConfigMap.Optional
-			}
-			if err := p.syncConfigmap(ctx, podNamespace, volume.ConfigMap.Name, optional); err != nil {
-				return fmt.Errorf("unable to sync configmap volume %s: %w", volume.Name, err)
-			}
-			volume.ConfigMap.Name = p.Translator.TranslateName(podNamespace, volume.ConfigMap.Name)
-		} else if volume.Secret != nil {
-			if volume.Secret.Optional != nil {
-				optional = *volume.Secret.Optional
-			}
-			if err := p.syncSecret(ctx, podNamespace, volume.Secret.SecretName, optional); err != nil {
-				return fmt.Errorf("unable to sync secret volume %s: %w", volume.Name, err)
-			}
-			volume.Secret.SecretName = p.Translator.TranslateName(podNamespace, volume.Secret.SecretName)
-		} else if volume.Projected != nil {
-			for _, source := range volume.Projected.Sources {
-				if source.ConfigMap != nil {
-					if source.ConfigMap.Optional != nil {
-						optional = *source.ConfigMap.Optional
-					}
-					configMapName := source.ConfigMap.Name
-					if err := p.syncConfigmap(ctx, podNamespace, configMapName, optional); err != nil {
-						return fmt.Errorf("unable to sync projected configmap %s: %w", configMapName, err)
-					}
-					source.ConfigMap.Name = p.Translator.TranslateName(podNamespace, configMapName)
-				} else if source.Secret != nil {
-					if source.Secret.Optional != nil {
-						optional = *source.Secret.Optional
-					}
-					secretName := source.Secret.Name
-					if err := p.syncSecret(ctx, podNamespace, secretName, optional); err != nil {
-						return fmt.Errorf("unable to sync projected secret %s: %w", secretName, err)
-					}
-				}
-			}
-		} else if volume.PersistentVolumeClaim != nil {
-			volume.PersistentVolumeClaim.ClaimName = p.Translator.TranslateName(podNamespace, volume.PersistentVolumeClaim.ClaimName)
-		} else if volume.DownwardAPI != nil {
-			for _, downwardAPI := range volume.DownwardAPI.Items {
-				if downwardAPI.FieldRef.FieldPath == translate.MetadataNameField {
-					downwardAPI.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.ResourceNameAnnotation)
-				}
-				if downwardAPI.FieldRef.FieldPath == translate.MetadataNamespaceField {
-					downwardAPI.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.ResourceNamespaceAnnotation)
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// syncConfigmap will add the configmap object to the queue of the syncer controller to be synced to the host cluster
-func (p *Provider) syncConfigmap(ctx context.Context, podNamespace string, configMapName string, optional bool) error {
-	var configMap corev1.ConfigMap
-	nsName := types.NamespacedName{
-		Namespace: podNamespace,
-		Name:      configMapName,
-	}
-	err := p.VirtualClient.Get(ctx, nsName, &configMap)
-	if err != nil {
-		// check if its optional configmap
-		if apierrors.IsNotFound(err) && optional {
-			return nil
-		}
-		return fmt.Errorf("unable to get configmap to sync %s/%s: %w", nsName.Namespace, nsName.Name, err)
-	}
-	err = p.Handler.AddResource(ctx, &configMap)
-	if err != nil {
-		return fmt.Errorf("unable to add configmap to sync %s/%s: %w", nsName.Namespace, nsName.Name, err)
-	}
-	return nil
-}
-
-// syncSecret will add the secret object to the queue of the syncer controller to be synced to the host cluster
-func (p *Provider) syncSecret(ctx context.Context, podNamespace string, secretName string, optional bool) error {
-	p.logger.Infow("Syncing secret", "Name", secretName, "Namespace", podNamespace, "optional", optional)
-	var secret corev1.Secret
-	nsName := types.NamespacedName{
-		Namespace: podNamespace,
-		Name:      secretName,
-	}
-	err := p.VirtualClient.Get(ctx, nsName, &secret)
-	if err != nil {
-		if apierrors.IsNotFound(err) && optional {
-			return nil
-		}
-		return fmt.Errorf("unable to get secret to sync %s/%s: %w", nsName.Namespace, nsName.Name, err)
-	}
-	err = p.Handler.AddResource(ctx, &secret)
-	if err != nil {
-		return fmt.Errorf("unable to add secret to sync %s/%s: %w", nsName.Namespace, nsName.Name, err)
-	}
-	return nil
-}
-
-// UpdatePod executes updatePod with retry
-func (p *Provider) UpdatePod(ctx context.Context, pod *corev1.Pod) error {
-	return p.withRetry(ctx, p.updatePod, pod)
-}
-
-func (p *Provider) updatePod(ctx context.Context, pod *v1.Pod) error {
-	p.logger.Debugw("got a request for update pod")
-
-	// Once scheduled a Pod cannot update other fields than the image of the containers, initcontainers and a few others
-	// See: https://kubernetes.io/docs/concepts/workloads/pods/#pod-update-and-replacement
-
-	// Update Pod in the virtual cluster
-
-	var currentVirtualPod v1.Pod
-	if err := p.VirtualClient.Get(ctx, client.ObjectKeyFromObject(pod), &currentVirtualPod); err != nil {
-		return fmt.Errorf("unable to get pod to update from virtual cluster: %w", err)
-	}
-
-	currentVirtualPod.Spec.Containers = updateContainerImages(currentVirtualPod.Spec.Containers, pod.Spec.Containers)
-	currentVirtualPod.Spec.InitContainers = updateContainerImages(currentVirtualPod.Spec.InitContainers, pod.Spec.InitContainers)
-
-	currentVirtualPod.Spec.ActiveDeadlineSeconds = pod.Spec.ActiveDeadlineSeconds
-	currentVirtualPod.Spec.Tolerations = pod.Spec.Tolerations
-
-	// in the virtual cluster we can update also the labels and annotations
-	currentVirtualPod.Annotations = pod.Annotations
-	currentVirtualPod.Labels = pod.Labels
-
-	if err := p.VirtualClient.Update(ctx, &currentVirtualPod); err != nil {
-		return fmt.Errorf("unable to update pod in the virtual cluster: %w", err)
-	}
-
-	// Update Pod in the host cluster
-
-	hostNamespaceName := types.NamespacedName{
-		Namespace: p.ClusterNamespace,
-		Name:      p.Translator.TranslateName(pod.Namespace, pod.Name),
-	}
-
-	var currentHostPod corev1.Pod
-	if err := p.HostClient.Get(ctx, hostNamespaceName, &currentHostPod); err != nil {
-		return fmt.Errorf("unable to get pod to update from host cluster: %w", err)
-	}
-
-	currentHostPod.Spec.Containers = updateContainerImages(currentHostPod.Spec.Containers, pod.Spec.Containers)
-	currentHostPod.Spec.InitContainers = updateContainerImages(currentHostPod.Spec.InitContainers, pod.Spec.InitContainers)
-
-	// update ActiveDeadlineSeconds and Tolerations
-	currentHostPod.Spec.ActiveDeadlineSeconds = pod.Spec.ActiveDeadlineSeconds
-	currentHostPod.Spec.Tolerations = pod.Spec.Tolerations
-
-	if err := p.HostClient.Update(ctx, &currentHostPod); err != nil {
-		return fmt.Errorf("unable to update pod in the host cluster: %w", err)
-	}
-
-	return nil
-}
-
-// updateContainerImages will update the images of the original container images with the same name
-func updateContainerImages(original, updated []v1.Container) []v1.Container {
-	newImages := make(map[string]string)
-
-	for _, c := range updated {
-		newImages[c.Name] = c.Image
-	}
-
-	for i, c := range original {
-		if updatedImage, found := newImages[c.Name]; found {
-			original[i].Image = updatedImage
-		}
-	}
-
-	return original
-}
-
-// DeletePod executes deletePod with retry
-func (p *Provider) DeletePod(ctx context.Context, pod *corev1.Pod) error {
-	return p.withRetry(ctx, p.deletePod, pod)
-}
-
-// deletePod takes a Kubernetes Pod and deletes it from the provider. Once a pod is deleted, the provider is
-// expected to call the NotifyPods callback with a terminal pod status where all the containers are in a terminal
-// state, as well as the pod. DeletePod may be called multiple times for the same pod.
-func (p *Provider) deletePod(ctx context.Context, pod *corev1.Pod) error {
-	p.logger.Infof("Got request to delete pod %s", pod.Name)
-	hostName := p.Translator.TranslateName(pod.Namespace, pod.Name)
-	err := p.CoreClient.Pods(p.ClusterNamespace).Delete(ctx, hostName, metav1.DeleteOptions{})
-	if err != nil {
-		return fmt.Errorf("unable to delete pod %s/%s: %w", pod.Namespace, pod.Name, err)
-	}
-	if err = p.pruneUnusedVolumes(ctx, pod); err != nil {
-		// note that we don't return an error here. The pod was successfully deleted, another process
-		// should clean this without affecting the user
-		p.logger.Errorf("failed to prune leftover volumes for %s/%s: %w, resources may be left", pod.Namespace, pod.Name, err)
-	}
-	p.logger.Infof("Deleted pod %s", pod.Name)
-	return nil
-}
-
-// pruneUnusedVolumes removes volumes in use by pod that aren't used by any other pods
-func (p *Provider) pruneUnusedVolumes(ctx context.Context, pod *corev1.Pod) error {
-	rawSecrets, rawConfigMaps := getSecretsAndConfigmaps(pod)
-	// since this pod was removed, originally mark all of the secrets/configmaps it uses as eligible
-	// for pruning
-	pruneSecrets := sets.Set[string]{}.Insert(rawSecrets...)
-	pruneConfigMap := sets.Set[string]{}.Insert(rawConfigMaps...)
-	var pods corev1.PodList
-	// only pods in the same namespace could be using secrets/configmaps that this pod is using
-	err := p.VirtualClient.List(ctx, &pods, &client.ListOptions{
-		Namespace: pod.Namespace,
-	})
-	if err != nil {
-		return fmt.Errorf("unable to list pods: %w", err)
-	}
-	for _, vPod := range pods.Items {
-		if vPod.Name == pod.Name {
-			continue
-		}
-		secrets, configMaps := getSecretsAndConfigmaps(&vPod)
-		pruneSecrets.Delete(secrets...)
-		pruneConfigMap.Delete(configMaps...)
-	}
-	for _, secretName := range pruneSecrets.UnsortedList() {
-		var secret corev1.Secret
-		err := p.VirtualClient.Get(ctx, types.NamespacedName{
-			Name:      secretName,
-			Namespace: pod.Namespace,
-		}, &secret)
-		if err != nil {
-			return fmt.Errorf("unable to get secret %s/%s for pod volume: %w", pod.Namespace, secretName, err)
-		}
-		err = p.Handler.RemoveResource(ctx, &secret)
-		if err != nil {
-			return fmt.Errorf("unable to remove secret %s/%s for pod volume: %w", pod.Namespace, secretName, err)
-		}
-	}
-	for _, configMapName := range pruneConfigMap.UnsortedList() {
-		var configMap corev1.ConfigMap
-		err := p.VirtualClient.Get(ctx, types.NamespacedName{
-			Name:      configMapName,
-			Namespace: pod.Namespace,
-		}, &configMap)
-		if err != nil {
-			return fmt.Errorf("unable to get configMap %s/%s for pod volume: %w", pod.Namespace, configMapName, err)
-		}
-
-		if err = p.Handler.RemoveResource(ctx, &configMap); err != nil {
-			return fmt.Errorf("unable to remove configMap %s/%s for pod volume: %w", pod.Namespace, configMapName, err)
-		}
-	}
-	return nil
-}
-
-// GetPod retrieves a pod by name from the provider (can be cached).
-// The Pod returned is expected to be immutable, and may be accessed
-// concurrently outside of the calling goroutine. Therefore it is recommended
-// to return a version after DeepCopy.
-func (p *Provider) GetPod(ctx context.Context, namespace, name string) (*corev1.Pod, error) {
-	p.logger.Debugw("got a request for get pod", "Namespace", namespace, "Name", name)
-	hostNamespaceName := types.NamespacedName{
-		Namespace: p.ClusterNamespace,
-		Name:      p.Translator.TranslateName(namespace, name),
-	}
-	var pod corev1.Pod
-	err := p.HostClient.Get(ctx, hostNamespaceName, &pod)
-	if err != nil {
-		return nil, fmt.Errorf("error when retrieving pod: %w", err)
-	}
-	p.Translator.TranslateFrom(&pod)
-	return &pod, nil
-}
-
-// GetPodStatus retrieves the status of a pod by name from the provider.
-// The PodStatus returned is expected to be immutable, and may be accessed
-// concurrently outside of the calling goroutine. Therefore it is recommended
-// to return a version after DeepCopy.
-func (p *Provider) GetPodStatus(ctx context.Context, namespace, name string) (*corev1.PodStatus, error) {
-	p.logger.Debugw("got a request for pod status", "Namespace", namespace, "Name", name)
-	pod, err := p.GetPod(ctx, namespace, name)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get pod for status: %w", err)
-	}
-	p.logger.Debugw("got pod status", "Namespace", namespace, "Name", name, "Status", pod.Status)
-	return pod.Status.DeepCopy(), nil
-}
-
-// GetPods retrieves a list of all pods running on the provider (can be cached).
-// The Pods returned are expected to be immutable, and may be accessed
-// concurrently outside of the calling goroutine. Therefore it is recommended
-// to return a version after DeepCopy.
-func (p *Provider) GetPods(ctx context.Context) ([]*corev1.Pod, error) {
-	selector := labels.NewSelector()
-	requirement, err := labels.NewRequirement(translate.ClusterNameLabel, selection.Equals, []string{p.ClusterName})
-	if err != nil {
-		return nil, fmt.Errorf("unable to create label selector: %w", err)
-	}
-	selector = selector.Add(*requirement)
-	var podList corev1.PodList
-	err = p.HostClient.List(ctx, &podList, &client.ListOptions{LabelSelector: selector})
-	if err != nil {
-		return nil, fmt.Errorf("unable to list pods: %w", err)
-	}
-	retPods := []*corev1.Pod{}
-	for _, pod := range podList.DeepCopy().Items {
-		p.Translator.TranslateFrom(&pod)
-		retPods = append(retPods, &pod)
-	}
-	return retPods, nil
-}
-
-// configureNetworking will inject network information to each pod to connect them to the
-// virtual cluster api server, as well as confiugre DNS information to connect them to the
-// synced coredns on the host cluster.
-func (p *Provider) configureNetworking(podName, podNamespace string, pod *corev1.Pod, serverIP string) {
-	// inject serverIP to hostalias for the pod
-	KubernetesHostAlias := corev1.HostAlias{
-		IP:        serverIP,
-		Hostnames: []string{"kubernetes", "kubernetes.default", "kubernetes.default.svc", "kubernetes.default.svc.cluster", "kubernetes.default.svc.cluster.local"},
-	}
-	pod.Spec.HostAliases = append(pod.Spec.HostAliases, KubernetesHostAlias)
-	// inject networking information to the pod's environment variables
-	for i := range pod.Spec.Containers {
-		pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env,
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT_443_TCP",
-				Value: "tcp://" + p.serverIP + ":6443",
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT",
-				Value: "tcp://" + p.serverIP + ":6443",
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT_443_TCP_ADDR",
-				Value: p.serverIP,
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_SERVICE_HOST",
-				Value: p.serverIP,
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_SERVICE_PORT",
-				Value: "6443",
-			},
-		)
-	}
-	// handle init containers as well
-	for i := range pod.Spec.InitContainers {
-		pod.Spec.InitContainers[i].Env = append(pod.Spec.InitContainers[i].Env,
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT_443_TCP",
-				Value: "tcp://" + p.serverIP + ":6443",
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT",
-				Value: "tcp://" + p.serverIP + ":6443",
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_PORT_443_TCP_ADDR",
-				Value: p.serverIP,
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_SERVICE_HOST",
-				Value: p.serverIP,
-			},
-			corev1.EnvVar{
-				Name:  "KUBERNETES_SERVICE_PORT",
-				Value: "6443",
-			},
-		)
-	}
-	// injecting cluster DNS IP to the pods except for coredns pod
-	if !strings.HasPrefix(podName, "coredns") {
-		pod.Spec.DNSPolicy = corev1.DNSNone
-		pod.Spec.DNSConfig = &corev1.PodDNSConfig{
-			Nameservers: []string{
-				p.dnsIP,
-			},
-			Searches: []string{
-				podNamespace + ".svc.cluster.local", "svc.cluster.local", "cluster.local",
-			},
-		}
-	}
-}
-
-// getSecretsAndConfigmaps retrieves a list of all secrets/configmaps that are in use by a given pod. Useful
-// for removing/seeing which virtual cluster resources need to be in the host cluster.
-func getSecretsAndConfigmaps(pod *corev1.Pod) ([]string, []string) {
-	var secrets []string
-	var configMaps []string
-	for _, volume := range pod.Spec.Volumes {
-		if volume.Secret != nil {
-			secrets = append(secrets, volume.Secret.SecretName)
-		} else if volume.ConfigMap != nil {
-			configMaps = append(configMaps, volume.ConfigMap.Name)
-		} else if volume.Projected != nil {
-			for _, source := range volume.Projected.Sources {
-				if source.ConfigMap != nil {
-					configMaps = append(configMaps, source.ConfigMap.Name)
-				} else if source.Secret != nil {
-					secrets = append(secrets, source.Secret.Name)
-				}
-			}
-		}
-	}
-	return secrets, configMaps
-}
-
-// configureFieldPathEnv will retrieve all annotations created by the pod mutator webhook
-// to assign env fieldpaths to pods, it will also make sure to change the metadata.name and metadata.namespace to the
-// assigned annotations
-func (p *Provider) configureFieldPathEnv(pod, tPod *v1.Pod) error {
-	// override metadata.name and metadata.namespace with pod annotations
-	for i, container := range pod.Spec.InitContainers {
-		for j, envVar := range container.Env {
-			if envVar.ValueFrom == nil || envVar.ValueFrom.FieldRef == nil {
-				continue
-			}
-
-			fieldPath := envVar.ValueFrom.FieldRef.FieldPath
-
-			if fieldPath == translate.MetadataNameField {
-				envVar.ValueFrom.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.ResourceNameAnnotation)
-				pod.Spec.InitContainers[i].Env[j] = envVar
-			}
-			if fieldPath == translate.MetadataNamespaceField {
-				envVar.ValueFrom.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.MetadataNamespaceField)
-				pod.Spec.InitContainers[i].Env[j] = envVar
-			}
-		}
-	}
-	for i, container := range pod.Spec.Containers {
-		for j, envVar := range container.Env {
-			if envVar.ValueFrom == nil || envVar.ValueFrom.FieldRef == nil {
-				continue
-			}
-			fieldPath := envVar.ValueFrom.FieldRef.FieldPath
-			if fieldPath == translate.MetadataNameField {
-				envVar.ValueFrom.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.ResourceNameAnnotation)
-				pod.Spec.Containers[i].Env[j] = envVar
-			}
-			if fieldPath == translate.MetadataNamespaceField {
-				envVar.ValueFrom.FieldRef.FieldPath = fmt.Sprintf("metadata.annotations['%s']", translate.ResourceNameAnnotation)
-				pod.Spec.Containers[i].Env[j] = envVar
-			}
-		}
-	}
-	for name, value := range pod.Annotations {
-		if strings.Contains(name, webhook.FieldpathField) {
-			containerIndex, envName, err := webhook.ParseFieldPathAnnotationKey(name)
-			if err != nil {
-				return err
-			}
-			// re-adding these envs to the pod
-			tPod.Spec.Containers[containerIndex].Env = append(tPod.Spec.Containers[containerIndex].Env, v1.EnvVar{
-				Name: envName,
-				ValueFrom: &v1.EnvVarSource{
-					FieldRef: &v1.ObjectFieldSelector{
-						FieldPath: value,
-					},
-				},
-			})
-			// removing the annotation from the pod
-			delete(tPod.Annotations, name)
-		}
-	}
-	return nil
-}

k3k-kubelet/provider/token.go

@@ -1,150 +0,0 @@
-package provider
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	k3kcontroller "github.com/rancher/k3k/pkg/controller"
-	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/ptr"
-)
-
-const (
-	kubeAPIAccessPrefix          = "kube-api-access"
-	serviceAccountTokenMountPath = "/var/run/secrets/kubernetes.io/serviceaccount"
-)
-
-// transformTokens copies the serviceaccount tokens used by pod's serviceaccount to a secret on the host cluster and mount it
-// to look like the serviceaccount token
-func (p *Provider) transformTokens(ctx context.Context, pod, tPod *corev1.Pod) error {
-	p.logger.Infow("transforming token", "Pod", pod.Name, "Namespace", pod.Namespace, "serviceAccountName", pod.Spec.ServiceAccountName)
-
-	// skip this process if the kube-api-access is already removed from the pod
-	// this is needed in case users already adds their own custom tokens like in rancher imported clusters
-	if !isKubeAccessVolumeFound(pod) {
-		return nil
-	}
-
-	virtualSecretName := k3kcontroller.SafeConcatNameWithPrefix(pod.Spec.ServiceAccountName, "token")
-	virtualSecret := virtualSecret(virtualSecretName, pod.Namespace, pod.Spec.ServiceAccountName)
-	if err := p.VirtualClient.Create(ctx, virtualSecret); err != nil {
-		if !apierrors.IsAlreadyExists(err) {
-			return err
-		}
-	}
-	// extracting the tokens data from the secret we just created
-	virtualSecretKey := types.NamespacedName{
-		Name:      virtualSecret.Name,
-		Namespace: virtualSecret.Namespace,
-	}
-	if err := p.VirtualClient.Get(ctx, virtualSecretKey, virtualSecret); err != nil {
-		return err
-	}
-	// To avoid race conditions we need to check if the secret's data has been populated
-	// including the token, ca.crt and namespace
-	if len(virtualSecret.Data) < 3 {
-		return fmt.Errorf("token secret %s/%s data is empty", virtualSecret.Namespace, virtualSecret.Name)
-	}
-	hostSecret := virtualSecret.DeepCopy()
-	hostSecret.Type = ""
-	hostSecret.Annotations = make(map[string]string)
-	p.Translator.TranslateTo(hostSecret)
-
-	if err := p.HostClient.Create(ctx, hostSecret); err != nil {
-		if !apierrors.IsAlreadyExists(err) {
-			return err
-		}
-	}
-	p.translateToken(tPod, hostSecret.Name)
-	return nil
-}
-
-func virtualSecret(name, namespace, serviceAccountName string) *corev1.Secret {
-	return &corev1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: namespace,
-			Annotations: map[string]string{
-				corev1.ServiceAccountNameKey: serviceAccountName,
-			},
-		},
-		Type: corev1.SecretTypeServiceAccountToken,
-	}
-}
-
-// translateToken will remove the serviceaccount from the pod and replace the kube-api-access volume
-// with a custom token volume and mount it to all containers within the pod
-func (p *Provider) translateToken(pod *corev1.Pod, hostSecretName string) {
-	pod.Spec.ServiceAccountName = ""
-	pod.Spec.DeprecatedServiceAccount = ""
-	pod.Spec.AutomountServiceAccountToken = ptr.To(false)
-	removeKubeAccessVolume(pod)
-	addKubeAccessVolume(pod, hostSecretName)
-}
-
-func isKubeAccessVolumeFound(pod *corev1.Pod) bool {
-	for _, volume := range pod.Spec.Volumes {
-		if strings.HasPrefix(volume.Name, kubeAPIAccessPrefix) {
-			return true
-		}
-	}
-	return false
-}
-
-func removeKubeAccessVolume(pod *corev1.Pod) {
-	for i, volume := range pod.Spec.Volumes {
-		if strings.HasPrefix(volume.Name, kubeAPIAccessPrefix) {
-			pod.Spec.Volumes = append(pod.Spec.Volumes[:i], pod.Spec.Volumes[i+1:]...)
-		}
-	}
-	// init containers
-	for i, container := range pod.Spec.InitContainers {
-		for j, mountPath := range container.VolumeMounts {
-			if strings.HasPrefix(mountPath.Name, kubeAPIAccessPrefix) {
-				pod.Spec.InitContainers[i].VolumeMounts = append(pod.Spec.InitContainers[i].VolumeMounts[:j], pod.Spec.InitContainers[i].VolumeMounts[j+1:]...)
-			}
-		}
-	}
-
-	for i, container := range pod.Spec.Containers {
-		for j, mountPath := range container.VolumeMounts {
-			if strings.HasPrefix(mountPath.Name, kubeAPIAccessPrefix) {
-				pod.Spec.Containers[i].VolumeMounts = append(pod.Spec.Containers[i].VolumeMounts[:j], pod.Spec.Containers[i].VolumeMounts[j+1:]...)
-			}
-		}
-	}
-}
-
-func addKubeAccessVolume(pod *corev1.Pod, hostSecretName string) {
-	var tokenVolumeName = k3kcontroller.SafeConcatNameWithPrefix(kubeAPIAccessPrefix)
-	pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{
-		Name: tokenVolumeName,
-		VolumeSource: corev1.VolumeSource{
-			Secret: &corev1.SecretVolumeSource{
-				SecretName: hostSecretName,
-			},
-		},
-	})
-
-	for i := range pod.Spec.InitContainers {
-		pod.Spec.InitContainers[i].VolumeMounts = append(pod.Spec.InitContainers[i].VolumeMounts, corev1.VolumeMount{
-			Name:      tokenVolumeName,
-			MountPath: serviceAccountTokenMountPath,
-		})
-	}
-
-	for i := range pod.Spec.Containers {
-		pod.Spec.Containers[i].VolumeMounts = append(pod.Spec.Containers[i].VolumeMounts, corev1.VolumeMount{
-			Name:      tokenVolumeName,
-			MountPath: serviceAccountTokenMountPath,
-		})
-	}
-}

k3k-kubelet/provider/util.go

@@ -1,25 +0,0 @@
-package provider
-
-import (
-	"github.com/virtual-kubelet/virtual-kubelet/node/api"
-	"k8s.io/client-go/tools/remotecommand"
-)
-
-// translatorSizeQueue feeds the size events from the WebSocket
-// resizeChan into the SPDY client input. Implements TerminalSizeQueue
-// interface.
-type translatorSizeQueue struct {
-	resizeChan <-chan api.TermSize
-}
-
-func (t *translatorSizeQueue) Next() *remotecommand.TerminalSize {
-	size, ok := <-t.resizeChan
-	if !ok {
-		return nil
-	}
-	newSize := remotecommand.TerminalSize{
-		Width:  size.Width,
-		Height: size.Height,
-	}
-	return &newSize
-}

k3k-kubelet/translate/host.go

@@ -1,110 +0,0 @@
-package translate
-
-import (
-	"encoding/hex"
-	"fmt"
-
-	"github.com/rancher/k3k/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-const (
-	// ClusterNameLabel is the key for the label that contains the name of the virtual cluster
-	// this resource was made in
-	ClusterNameLabel = "k3k.io/clusterName"
-	// ResourceNameAnnotation is the key for the annotation that contains the original name of this
-	// resource in the virtual cluster
-	ResourceNameAnnotation = "k3k.io/name"
-	// ResourceNamespaceAnnotation is the key for the annotation that contains the original namespace of this
-	// resource in the virtual cluster
-	ResourceNamespaceAnnotation = "k3k.io/namespace"
-	// MetadataNameField is the downwardapi field for object's name
-	MetadataNameField = "metadata.name"
-	// MetadataNamespaceField is the downward field for the object's namespace
-	MetadataNamespaceField = "metadata.namespace"
-)
-
-type ToHostTranslator struct {
-	// ClusterName is the name of the virtual cluster whose resources we are
-	// translating to a host cluster
-	ClusterName string
-	// ClusterNamespace is the namespace of the virtual cluster whose resources
-	// we are translating to a host cluster
-	ClusterNamespace string
-}
-
-// Translate translates a virtual cluster object to a host cluster object. This should only be used for
-// static resources such as configmaps/secrets, and not for things like pods (which can reference other
-// objects). Note that this won't set host-cluster values (like resource version) so when updating you
-// may need to fetch the existing value and do some combination before using this.
-func (t *ToHostTranslator) TranslateTo(obj client.Object) {
-	// owning objects may be in the virtual cluster, but may not be in the host cluster
-	obj.SetOwnerReferences(nil)
-	// add some annotations to make it easier to track source object
-	annotations := obj.GetAnnotations()
-	if annotations == nil {
-		annotations = map[string]string{}
-	}
-	annotations[ResourceNameAnnotation] = obj.GetName()
-	annotations[ResourceNamespaceAnnotation] = obj.GetNamespace()
-	obj.SetAnnotations(annotations)
-	// add a label to quickly identify objects owned by a given virtual cluster
-	labels := obj.GetLabels()
-	if labels == nil {
-		labels = map[string]string{}
-	}
-	labels[ClusterNameLabel] = t.ClusterName
-	obj.SetLabels(labels)
-
-	// resource version/UID won't match what's in the host cluster.
-	obj.SetResourceVersion("")
-	obj.SetUID("")
-
-	// set the name and the namespace so that this goes in the proper host namespace
-	// and doesn't collide with other resources
-	obj.SetName(t.TranslateName(obj.GetNamespace(), obj.GetName()))
-	obj.SetNamespace(t.ClusterNamespace)
-	obj.SetFinalizers(nil)
-}
-
-func (t *ToHostTranslator) TranslateFrom(obj client.Object) {
-	// owning objects may be in the virtual cluster, but may not be in the host cluster
-	obj.SetOwnerReferences(nil)
-
-	// remove the annotations added to track original name
-	annotations := obj.GetAnnotations()
-	// TODO: It's possible that this was erased by a change on the host cluster
-	// In this case, we need to have some sort of fallback or error return
-	name := annotations[ResourceNameAnnotation]
-	namespace := annotations[ResourceNamespaceAnnotation]
-	obj.SetName(name)
-	obj.SetNamespace(namespace)
-	delete(annotations, ResourceNameAnnotation)
-	delete(annotations, ResourceNamespaceAnnotation)
-	obj.SetAnnotations(annotations)
-
-	// remove the clusteName tracking label
-	labels := obj.GetLabels()
-	delete(labels, ClusterNameLabel)
-	obj.SetLabels(labels)
-
-	// resource version/UID won't match what's in the virtual cluster.
-	obj.SetResourceVersion("")
-	obj.SetUID("")
-
-}
-
-// TranslateName returns the name of the resource in the host cluster. Will not update the object with this name.
-func (t *ToHostTranslator) TranslateName(namespace string, name string) string {
-	// we need to come up with a name which is:
-	// - somewhat connectable to the original resource
-	// - a valid k8s name
-	// - idempotently calculatable
-	// - unique for this combination of name/namespace/cluster
-	namePrefix := fmt.Sprintf("%s-%s-%s", name, namespace, t.ClusterName)
-	// use + as a separator since it can't be in an object name
-	nameKey := fmt.Sprintf("%s+%s+%s", name, namespace, t.ClusterName)
-	// it's possible that the suffix will be in the name, so we use hex to make it valid for k8s
-	nameSuffix := hex.EncodeToString([]byte(nameKey))
-	return controller.SafeConcatName(namePrefix, nameSuffix)
-}

main.go

@@ -3,149 +3,50 @@ package main
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"os"
+	"flag"
 
-	"github.com/go-logr/zapr"
-	"github.com/rancher/k3k/cli/cmds"
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/buildinfo"
 	"github.com/rancher/k3k/pkg/controller/cluster"
-	"github.com/rancher/k3k/pkg/controller/clusterset"
-	"github.com/rancher/k3k/pkg/log"
-	"github.com/urfave/cli/v2"
-	"go.uber.org/zap"
-	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
+	ctrlconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
-var (
-	scheme                     = runtime.NewScheme()
-	clusterCIDR                string
-	sharedAgentImage           string
-	sharedAgentImagePullPolicy string
-	kubeconfig                 string
-	debug                      bool
-	logger                     *log.Logger
-	flags                      = []cli.Flag{
-		&cli.StringFlag{
-			Name:        "kubeconfig",
-			EnvVars:     []string{"KUBECONFIG"},
-			Usage:       "Kubeconfig path",
-			Destination: &kubeconfig,
-		},
-		&cli.StringFlag{
-			Name:        "cluster-cidr",
-			EnvVars:     []string{"CLUSTER_CIDR"},
-			Usage:       "Cluster CIDR to be added to the networkpolicy of the clustersets",
-			Destination: &clusterCIDR,
-		},
-		&cli.StringFlag{
-			Name:        "shared-agent-image",
-			EnvVars:     []string{"SHARED_AGENT_IMAGE"},
-			Usage:       "K3K Virtual Kubelet image",
-			Value:       "rancher/k3k:latest",
-			Destination: &sharedAgentImage,
-		},
-		&cli.StringFlag{
-			Name:        "shared-agent-pull-policy",
-			EnvVars:     []string{"SHARED_AGENT_PULL_POLICY"},
-			Usage:       "K3K Virtual Kubelet image pull policy must be one of Always, IfNotPresent or Never",
-			Destination: &sharedAgentImagePullPolicy,
-		},
-		&cli.BoolFlag{
-			Name:        "debug",
-			EnvVars:     []string{"DEBUG"},
-			Usage:       "Debug level logging",
-			Destination: &debug,
-		},
-	}
-)
+var Scheme = runtime.NewScheme()
 
 func init() {
-	_ = clientgoscheme.AddToScheme(scheme)
-	_ = v1alpha1.AddToScheme(scheme)
+	_ = clientgoscheme.AddToScheme(Scheme)
+	_ = v1alpha1.AddToScheme(Scheme)
 }
 
 func main() {
-	app := cmds.NewApp()
-	app.Flags = flags
-	app.Action = run
-	app.Version = buildinfo.Version
-	app.Before = func(clx *cli.Context) error {
-		if err := validate(); err != nil {
-			return err
-		}
-		logger = log.New(debug)
-		return nil
-	}
-	if err := app.Run(os.Args); err != nil {
-		logger.Fatalw("failed to run k3k controller", zap.Error(err))
-	}
-}
+	ctrlconfig.RegisterFlags(nil)
+	flag.Parse()
 
-func run(clx *cli.Context) error {
 	ctx := context.Background()
 
-	logger.Info("Starting k3k - Version: " + buildinfo.Version)
-
+	kubeconfig := flag.Lookup("kubeconfig").Value.String()
 	restConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
 	if err != nil {
-		return fmt.Errorf("failed to create config from kubeconfig file: %v", err)
+		klog.Fatalf("Failed to create config from kubeconfig file: %v", err)
 	}
 
 	mgr, err := ctrl.NewManager(restConfig, manager.Options{
-		Scheme: scheme,
+		Scheme: Scheme,
 	})
-
 	if err != nil {
-		return fmt.Errorf("failed to create new controller runtime manager: %v", err)
+		klog.Fatalf("Failed to create new controller runtime manager: %v", err)
 	}
 
-	ctrlruntimelog.SetLogger(zapr.NewLogger(logger.Desugar().WithOptions(zap.AddCallerSkip(1))))
-
-	logger.Info("adding cluster controller")
-	if err := cluster.Add(ctx, mgr, sharedAgentImage, sharedAgentImagePullPolicy); err != nil {
-		return fmt.Errorf("failed to add the new cluster controller: %v", err)
-	}
-
-	logger.Info("adding etcd pod controller")
-	if err := cluster.AddPodController(ctx, mgr); err != nil {
-		return fmt.Errorf("failed to add the new cluster controller: %v", err)
-	}
-
-	logger.Info("adding clusterset controller")
-	if err := clusterset.Add(ctx, mgr, clusterCIDR); err != nil {
-		return fmt.Errorf("failed to add the clusterset controller: %v", err)
-	}
-
-	if clusterCIDR == "" {
-		logger.Info("adding networkpolicy node controller")
-		if err := clusterset.AddNodeController(ctx, mgr); err != nil {
-			return fmt.Errorf("failed to add the clusterset node controller: %v", err)
-		}
+	if err := cluster.Add(ctx, mgr); err != nil {
+		klog.Fatalf("Failed to add the new controller: %v", err)
 	}
 
 	if err := mgr.Start(ctx); err != nil {
-		return fmt.Errorf("failed to start the manager: %v", err)
+		klog.Fatalf("Failed to start the manager: %v", err)
 	}
-
-	return nil
-}
-
-func validate() error {
-	if sharedAgentImagePullPolicy != "" {
-		if sharedAgentImagePullPolicy != string(v1.PullAlways) &&
-			sharedAgentImagePullPolicy != string(v1.PullIfNotPresent) &&
-			sharedAgentImagePullPolicy != string(v1.PullNever) {
-			return errors.New("invalid value for shared agent image policy")
-		}
-	}
-	return nil
 }

ops/build

@@ -15,32 +15,14 @@ LINKFLAGS="-X github.com/rancher/k3k.Version=$VERSION"
 LINKFLAGS="-X github.com/rancher/k3k.GitCommit=$COMMIT $LINKFLAGS"
 CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k
 if [ "$CROSS" = "true" ] && [ "$ARCH" = "amd64" ]; then
-    CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k-s390x 
-    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k-arm64 
-    GOOS=freebsd GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3k-freebsd
-    GOOS=darwin GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3k-darwin-amd64 
-    GOOS=darwin GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3k-darwin-aarch64
-    GOOS=windows GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3k-windows
-fi
-
-# build k3k-kubelet
-CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k-kubelet ./k3k-kubelet
-if [ "$CROSS" = "true" ] && [ "$ARCH" = "amd64" ]; then
-    CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k-kubelet-s390x 
-    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k-kubelet-arm64 
-    GOOS=freebsd GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3k-kubelet-freebsd
-    GOOS=darwin GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3k-kubelet-darwin-amd64 
-    GOOS=darwin GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3k-kubelet-darwin-aarch64
-    GOOS=windows GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3k-kubelet-windows
+    GOOS=darwin go build -ldflags "$LINKFLAGS" -o bin/k3k-darwin
+    GOOS=windows go build -ldflags "$LINKFLAGS" -o bin/k3k-windows
 fi
 
 # build k3kcli
 CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3kcli ./cli
 if [ "$CROSS" = "true" ] && [ "$ARCH" = "amd64" ]; then
-    CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3kcli-s390x ./cli
-    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3kcli-arm64 ./cli
-    GOOS=freebsd GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3kcli-freebsd ./cli
-    GOOS=darwin GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3kcli-darwin-amd64 ./cli
-    GOOS=darwin GOARCH=arm64 go build -ldflags "$LINKFLAGS" -o bin/k3kcli-darwin-aarch64 ./cli
-    GOOS=windows GOARCH=amd64 go build -ldflags "$LINKFLAGS" -o bin/k3kcli-windows ./cli
+    GOOS=darwin go build -ldflags "$LINKFLAGS" -o bin/k3kcli-darwin ./cli
+    GOOS=windows go build -ldflags "$LINKFLAGS" -o bin/k3kcli-windows ./cli
 fi
+

ops/build-crds

@@ -1,8 +0,0 @@
-#! /bin/sh
-
-cd $(dirname $0)/../
-
-# This will return non-zero until all of our objects in ./pkg/apis can generate valid crds.
-# allowDangerousTypes is needed for struct that use floats
-controller-gen crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=false paths=./pkg/apis/... output:crd:dir=./charts/k3k/crds
-

ops/checksum

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-cd $(dirname $0)/..
-
-CHECKSUM_DIR=${CHECKSUM_DIR:-./bin}
-
-sumfile="${CHECKSUM_DIR}/sha256sum.txt"
-echo -n "" > "${sumfile}"
-
-files=$(ls ${CHECKSUM_DIR} | grep -v "sha256sum.txt")
-for file in ${files}; do
-  sha256sum "${CHECKSUM_DIR}/${file}" | sed "s;$(dirname ${CHECKSUM_DIR}/${file})/;;g" >> "${sumfile}"
-done
-
-cat "${sumfile}"

ops/ci

@@ -4,7 +4,6 @@ set -e
 cd $(dirname $0)
 
 ./build
-./checksum
 ./test
 ./validate
 ./validate-ci

ops/package

@@ -8,7 +8,6 @@ cd $(dirname $0)/..
 mkdir -p dist/artifacts
 cp bin/k3k dist/artifacts/k3k${SUFFIX}
 cp bin/k3kcli dist/artifacts/k3kcli${SUFFIX}
-cp bin/k3k-kubelet dist/artifacts/k3k-kubelet${SUFFIX}
 
 IMAGE=${REPO}/k3k:${TAG}
 DOCKERFILE=package/Dockerfile
@@ -18,13 +17,3 @@ fi
 
 docker build -f ${DOCKERFILE} -t ${IMAGE} .
 echo Built ${IMAGE}
-
-# todo: This might need to go to it's own repo
-IMAGE=${REPO}/k3k:${TAG}-kubelet
-DOCKERFILE=package/Dockerfile.kubelet
-if [ -e ${DOCKERFILE}.${ARCH} ]; then
-    DOCKERFILE=${DOCKERFILE}.${ARCH}
-fi
-
-docker build -f ${DOCKERFILE} -t ${IMAGE} .
-echo Built ${IMAGE}

ops/release-chart

@@ -12,20 +12,21 @@ if [ $(git tag -l "$version") ]; then
     exit 1
 fi
 
+# release the chart with artifacts
+cr upload --token ${GITHUB_TOKEN} \
+          --release-name-template "chart-{{ .Version }}" \
+          --package-path ./deploy/ \
+          --git-repo k3k \
+          --skip-existing \
+          -o rancher
+
 # update the index.yaml
 cr index  --token ${GITHUB_TOKEN} \
           --release-name-template "chart-{{ .Version }}" \
           --package-path ./deploy/ \
           --index-path index.yaml \
           --git-repo k3k \
-          -o rancher
+          -o rancher \
+          --push
 
-# push to gh-pages
-git config --global user.email "hussein.galal.ahmed.11@gmail.com"
-git config --global user.name "galal-hussein"
-git config --global url.https://${GITHUB_TOKEN}@github.com/.insteadOf https://github.com/
-
-# push index.yaml to gh-pages
-git add index.yaml
-git commit -m "add chart-${CHART_TAG} to index.yaml"
-git push --force --set-upstream origin HEAD:gh-pages
+   

ops/test

@@ -3,7 +3,5 @@ set -e
 
 cd $(dirname $0)/..
 
-if [ -z ${SKIP_TESTS} ]; then
-  echo Running tests
-  go test -cover -tags=test ./...
-fi
+echo Running tests
+go test -cover -tags=test ./...

ops/version

@@ -5,7 +5,7 @@ if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
 fi
 
 COMMIT=$(git rev-parse --short HEAD)
-GIT_TAG=${TAG:-$(git tag -l --contains HEAD | head -n 1)}
+GIT_TAG=${DRONE_TAG:-$(git tag -l --contains HEAD | head -n 1)}
 
 if [[ -z "$DIRTY" && -n "$GIT_TAG" ]]; then
     VERSION=$GIT_TAG
@@ -19,15 +19,9 @@ fi
 
 SUFFIX="-${ARCH}"
 
-
-if [[ $VERSION = "chart*" ]]; then
-  TAG=${TAG:-${VERSION}}
-else 
-  TAG=${TAG:-${VERSION}${SUFFIX}}
-fi
-
+TAG=${TAG:-${VERSION}${SUFFIX}}
 REPO=${REPO:-rancher}
 
-if echo $TAG | grep dirty; then
+if echo $TAG | grep -q dirty; then
     TAG=dev
 fi

package/Dockerfile

@@ -1,9 +1,4 @@
 FROM alpine
-
-ARG BIN_K3K=bin/k3k
-ARG BIN_K3KCLI=bin/k3kcli
-
-COPY ${BIN_K3K} /usr/bin/
-COPY ${BIN_K3KCLI} /usr/bin/
-
+COPY bin/k3k /usr/bin/
+COPY bin/k3kcli /usr/bin/
 CMD ["k3k"]

package/Dockerfile.kubelet

@@ -1,8 +0,0 @@
-# TODO: swicth this to BCI-micro or scratch. Left as base right now so that debug can be done a bit easier
-FROM registry.suse.com/bci/bci-base:15.6
-
-ARG BIN_K3K_KUBELET=bin/k3k-kubelet
-
-COPY ${BIN_K3K_KUBELET} /usr/bin/
-
-ENTRYPOINT ["/usr/bin/k3k-kubelet"]

pkg/apis/k3k.io/v1alpha1/register.go

@@ -7,10 +7,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
+var SchemeGroupVersion = schema.GroupVersion{Group: k3k.GroupName, Version: "v1alpha1"}
+
 var (
-	SchemeGroupVersion = schema.GroupVersion{Group: k3k.GroupName, Version: "v1alpha1"}
-	SchemBuilder       = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme        = SchemBuilder.AddToScheme
+	SchemBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme  = SchemBuilder.AddToScheme
 )
 
 func Resource(resource string) schema.GroupResource {
@@ -20,10 +21,7 @@ func Resource(resource string) schema.GroupResource {
 func addKnownTypes(s *runtime.Scheme) error {
 	s.AddKnownTypes(SchemeGroupVersion,
 		&Cluster{},
-		&ClusterList{},
-		&ClusterSet{},
-		&ClusterSetList{},
-	)
+		&ClusterList{})
 	metav1.AddToGroupVersion(s, SchemeGroupVersion)
 	return nil
 }

pkg/apis/k3k.io/v1alpha1/set_types.go

@@ -1,86 +0,0 @@
-package v1alpha1
-
-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-// +kubebuilder:object:root=true
-type ClusterSet struct {
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-	metav1.TypeMeta   `json:",inline"`
-
-	// +kubebuilder:default={}
-	//
-	// Spec is the spec of the ClusterSet
-	Spec ClusterSetSpec `json:"spec"`
-
-	// Status is the status of the ClusterSet
-	Status ClusterSetStatus `json:"status,omitempty"`
-}
-
-type ClusterSetSpec struct {
-	// MaxLimits are the limits that apply to all clusters (server + agent) in the set
-	MaxLimits v1.ResourceList `json:"maxLimits,omitempty"`
-
-	// DefaultLimits are the limits used for servers/agents when a cluster in the set doesn't provide any
-	DefaultLimits *ClusterLimit `json:"defaultLimits,omitempty"`
-
-	// DefaultNodeSelector is the node selector that applies to all clusters (server + agent) in the set
-	DefaultNodeSelector map[string]string `json:"defaultNodeSelector,omitempty"`
-
-	// DefaultPriorityClass is the priorityClassName applied to all pods of all clusters in the set
-	DefaultPriorityClass string `json:"defaultPriorityClass,omitempty"`
-
-	// DisableNetworkPolicy is an option that will disable the creation of a default networkpolicy for cluster isolation
-	DisableNetworkPolicy bool `json:"disableNetworkPolicy,omitempty"`
-
-	// +kubebuilder:default={shared}
-	// +kubebuilder:validation:XValidation:message="mode is immutable",rule="self == oldSelf"
-	// +kubebuilder:validation:MinItems=1
-	//
-	// AllowedNodeTypes are the allowed cluster provisioning modes. Defaults to [shared].
-	AllowedNodeTypes []ClusterMode `json:"allowedNodeTypes,omitempty"`
-
-	// PodSecurityAdmissionLevel is the policy level applied to the pods in the namespace.
-	PodSecurityAdmissionLevel *PodSecurityAdmissionLevel `json:"podSecurityAdmissionLevel,omitempty"`
-}
-
-// +kubebuilder:validation:Enum=privileged;baseline;restricted
-//
-// PodSecurityAdmissionLevel is the policy level applied to the pods in the namespace.
-type PodSecurityAdmissionLevel string
-
-const (
-	PrivilegedPodSecurityAdmissionLevel = PodSecurityAdmissionLevel("privileged")
-	BaselinePodSecurityAdmissionLevel   = PodSecurityAdmissionLevel("baseline")
-	RestrictedPodSecurityAdmissionLevel = PodSecurityAdmissionLevel("restricted")
-)
-
-type ClusterSetStatus struct {
-
-	// ObservedGeneration was the generation at the time the status was updated.
-	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
-
-	// LastUpdate is the timestamp when the status was last updated
-	LastUpdate string `json:"lastUpdateTime,omitempty"`
-
-	// Summary is a summary of the status
-	Summary string `json:"summary,omitempty"`
-
-	// Conditions are the invidual conditions for the cluster set
-	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-type ClusterSetList struct {
-	metav1.ListMeta `json:"metadata,omitempty"`
-	metav1.TypeMeta `json:",inline"`
-
-	Items []ClusterSet `json:"items"`
-}

pkg/apis/k3k.io/v1alpha1/types.go

@@ -1,130 +1,36 @@
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
+
 type Cluster struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 	metav1.TypeMeta   `json:",inline"`
 
-	// +kubebuilder:default={}
-	// +optional
 	Spec   ClusterSpec   `json:"spec"`
-	Status ClusterStatus `json:"status,omitempty"`
+	Status ClusterStatus `json:"status"`
 }
 
 type ClusterSpec struct {
-	// Version is a string representing the Kubernetes version to be used by the virtual nodes.
-	//
-	// +optional
-	Version string `json:"version"`
+	Name        string   `json:"name"`
+	Version     string   `json:"version"`
+	Servers     *int32   `json:"servers"`
+	Agents      *int32   `json:"agents"`
+	Token       string   `json:"token"`
+	ClusterCIDR string   `json:"clusterCIDR,omitempty"`
+	ServiceCIDR string   `json:"serviceCIDR,omitempty"`
+	ClusterDNS  string   `json:"clusterDNS,omitempty"`
+	ServerArgs  []string `json:"serverArgs,omitempty"`
+	AgentArgs   []string `json:"agentArgs,omitempty"`
+	TLSSANs     []string `json:"tlsSANs,omitempty"`
+	Addons      []Addon  `json:"addons,omitempty"`
 
-	// Servers is the number of K3s pods to run in server (controlplane) mode.
-	//
-	// +kubebuilder:default=1
-	// +kubebuilder:validation:XValidation:message="cluster must have at least one server",rule="self >= 1"
-	// +optional
-	Servers *int32 `json:"servers"`
-
-	// Agents is the number of K3s pods to run in agent (worker) mode.
-	//
-	// +kubebuilder:default=0
-	// +kubebuilder:validation:XValidation:message="invalid value for agents",rule="self >= 0"
-	// +optional
-	Agents *int32 `json:"agents"`
-
-	// NodeSelector is the node selector that will be applied to all server/agent pods.
-	// In "shared" mode the node selector will be applied also to the workloads.
-	//
-	// +optional
-	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
-
-	// PriorityClass is the priorityClassName that will be applied to all server/agent pods.
-	// In "shared" mode the priorityClassName will be applied also to the workloads.
-	PriorityClass string `json:"priorityClass,omitempty"`
-
-	// Limit is the limits that apply for the server/worker nodes.
-	Limit *ClusterLimit `json:"clusterLimit,omitempty"`
-
-	// TokenSecretRef is Secret reference used as a token join server and worker nodes to the cluster. The controller
-	// assumes that the secret has a field "token" in its data, any other fields in the secret will be ignored.
-	// +optional
-	TokenSecretRef *v1.SecretReference `json:"tokenSecretRef"`
-
-	// ClusterCIDR is the CIDR range for the pods of the cluster. Defaults to 10.42.0.0/16.
-	// +kubebuilder:validation:XValidation:message="clusterCIDR is immutable",rule="self == oldSelf"
-	ClusterCIDR string `json:"clusterCIDR,omitempty"`
-
-	// ServiceCIDR is the CIDR range for the services in the cluster. Defaults to 10.43.0.0/16.
-	// +kubebuilder:validation:XValidation:message="serviceCIDR is immutable",rule="self == oldSelf"
-	ServiceCIDR string `json:"serviceCIDR,omitempty"`
-
-	// ClusterDNS is the IP address for the coredns service. Needs to be in the range provided by ServiceCIDR or CoreDNS may not deploy.
-	// Defaults to 10.43.0.10.
-	// +kubebuilder:validation:XValidation:message="clusterDNS is immutable",rule="self == oldSelf"
-	ClusterDNS string `json:"clusterDNS,omitempty"`
-
-	// ServerArgs are the ordered key value pairs (e.x. "testArg", "testValue") for the K3s pods running in server mode.
-	ServerArgs []string `json:"serverArgs,omitempty"`
-
-	// AgentArgs are the ordered key value pairs (e.x. "testArg", "testValue") for the K3s pods running in agent mode.
-	AgentArgs []string `json:"agentArgs,omitempty"`
-
-	// TLSSANs are the subjectAlternativeNames for the certificate the K3s server will use.
-	TLSSANs []string `json:"tlsSANs,omitempty"`
-
-	// Addons is a list of secrets containing raw YAML which will be deployed in the virtual K3k cluster on startup.
-	Addons []Addon `json:"addons,omitempty"`
-
-	// Mode is the cluster provisioning mode which can be either "shared" or "virtual". Defaults to "shared"
-	//
-	// +kubebuilder:default="shared"
-	// +kubebuilder:validation:Enum=shared;virtual
-	// +kubebuilder:validation:XValidation:message="mode is immutable",rule="self == oldSelf"
-	// +optional
-	Mode ClusterMode `json:"mode,omitempty"`
-
-	// Persistence contains options controlling how the etcd data of the virtual cluster is persisted. By default, no data
-	// persistence is guaranteed, so restart of a virtual cluster pod may result in data loss without this field.
-	// +kubebuilder:default={type: "dynamic"}
-	Persistence PersistenceConfig `json:"persistence,omitempty"`
-
-	// Expose contains options for exposing the apiserver inside/outside of the cluster. By default, this is only exposed as a
-	// clusterIP which is relatively secure, but difficult to access outside of the cluster.
-	// +optional
-	Expose *ExposeConfig `json:"expose,omitempty"`
-}
-
-// +kubebuilder:validation:Enum=shared;virtual
-// +kubebuilder:default="shared"
-//
-// ClusterMode is the possible provisioning mode of a Cluster.
-type ClusterMode string
-
-// +kubebuilder:default="dynamic"
-//
-// PersistenceMode is the storage mode of a Cluster.
-type PersistenceMode string
-
-const (
-	SharedClusterMode  = ClusterMode("shared")
-	VirtualClusterMode = ClusterMode("virtual")
-	EphemeralNodeType  = PersistenceMode("ephemeral")
-	DynamicNodesType   = PersistenceMode("dynamic")
-)
-
-type ClusterLimit struct {
-	// ServerLimit is the limits (cpu/mem) that apply to the server nodes
-	ServerLimit v1.ResourceList `json:"serverLimit,omitempty"`
-	// WorkerLimit is the limits (cpu/mem) that apply to the agent nodes
-	WorkerLimit v1.ResourceList `json:"workerLimit,omitempty"`
+	Persistence *PersistenceConfig `json:"persistence,omitempty"`
+	Expose      *ExposeConfig      `json:"expose,omitempty"`
 }
 
 type Addon struct {
@@ -133,7 +39,7 @@ type Addon struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
+
 type ClusterList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	metav1.TypeMeta `json:",inline"`
@@ -142,26 +48,21 @@ type ClusterList struct {
 }
 
 type PersistenceConfig struct {
-	// +kubebuilder:default="dynamic"
-	Type               PersistenceMode `json:"type"`
-	StorageClassName   *string         `json:"storageClassName,omitempty"`
-	StorageRequestSize string          `json:"storageRequestSize,omitempty"`
+	// Type can be ephermal, static, dynamic
+	Type               string `json:"type"`
+	StorageClassName   string `json:"storageClassName,omitempty"`
+	StorageRequestSize string `json:"storageRequestSize,omitempty"`
 }
 
 type ExposeConfig struct {
-	// +optional
-	Ingress *IngressConfig `json:"ingress,omitempty"`
-	// +optional
-	LoadBalancer *LoadBalancerConfig `json:"loadbalancer,omitempty"`
-	// +optional
-	NodePort *NodePortConfig `json:"nodePort,omitempty"`
+	Ingress      *IngressConfig      `json:"ingress"`
+	LoadBalancer *LoadBalancerConfig `json:"loadbalancer"`
+	NodePort     *NodePortConfig     `json:"nodePort"`
 }
 
 type IngressConfig struct {
-	// Annotations is a key value map that will enrich the Ingress annotations
-	// +optional
-	Annotations      map[string]string `json:"annotations,omitempty"`
-	IngressClassName string            `json:"ingressClassName,omitempty"`
+	Enabled          bool   `json:"enabled"`
+	IngressClassName string `json:"ingressClassName"`
 }
 
 type LoadBalancerConfig struct {
@@ -169,25 +70,11 @@ type LoadBalancerConfig struct {
 }
 
 type NodePortConfig struct {
-	// ServerPort is the port on each node on which the K3s server service is exposed when type is NodePort.
-	// If not specified, a port will be allocated (default: 30000-32767)
-	// +optional
-	ServerPort *int32 `json:"serverPort,omitempty"`
-	// ServicePort is the port on each node on which the K3s service is exposed when type is NodePort.
-	// If not specified, a port will be allocated (default: 30000-32767)
-	// +optional
-	ServicePort *int32 `json:"servicePort,omitempty"`
-	// ETCDPort is the port on each node on which the ETCD service is exposed when type is NodePort.
-	// If not specified, a port will be allocated (default: 30000-32767)
-	// +optional
-	ETCDPort *int32 `json:"etcdPort,omitempty"`
+	Enabled bool `json:"enabled"`
 }
 
 type ClusterStatus struct {
-	HostVersion string            `json:"hostVersion,omitempty"`
-	ClusterCIDR string            `json:"clusterCIDR,omitempty"`
-	ServiceCIDR string            `json:"serviceCIDR,omitempty"`
-	ClusterDNS  string            `json:"clusterDNS,omitempty"`
-	TLSSANs     []string          `json:"tlsSANs,omitempty"`
-	Persistence PersistenceConfig `json:"persistence,omitempty"`
+	ClusterCIDR string `json:"clusterCIDR,omitempty"`
+	ServiceCIDR string `json:"serviceCIDR,omitempty"`
+	ClusterDNS  string `json:"clusterDNS,omitempty"`
 }

pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go

@@ -6,8 +6,6 @@
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -33,7 +31,7 @@ func (in *Cluster) DeepCopyInto(out *Cluster) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.TypeMeta = in.TypeMeta
 	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
+	out.Status = in.Status
 	return
 }
 
@@ -55,36 +53,6 @@ func (in *Cluster) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterLimit) DeepCopyInto(out *ClusterLimit) {
-	*out = *in
-	if in.ServerLimit != nil {
-		in, out := &in.ServerLimit, &out.ServerLimit
-		*out = make(v1.ResourceList, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val.DeepCopy()
-		}
-	}
-	if in.WorkerLimit != nil {
-		in, out := &in.WorkerLimit, &out.WorkerLimit
-		*out = make(v1.ResourceList, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val.DeepCopy()
-		}
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterLimit.
-func (in *ClusterLimit) DeepCopy() *ClusterLimit {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterLimit)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterList) DeepCopyInto(out *ClusterList) {
 	*out = *in
@@ -118,135 +86,6 @@ func (in *ClusterList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSet) DeepCopyInto(out *ClusterSet) {
-	*out = *in
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.TypeMeta = in.TypeMeta
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSet.
-func (in *ClusterSet) DeepCopy() *ClusterSet {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterSet) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSetList) DeepCopyInto(out *ClusterSetList) {
-	*out = *in
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	out.TypeMeta = in.TypeMeta
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ClusterSet, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSetList.
-func (in *ClusterSetList) DeepCopy() *ClusterSetList {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSetList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterSetList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSetSpec) DeepCopyInto(out *ClusterSetSpec) {
-	*out = *in
-	if in.MaxLimits != nil {
-		in, out := &in.MaxLimits, &out.MaxLimits
-		*out = make(v1.ResourceList, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val.DeepCopy()
-		}
-	}
-	if in.DefaultLimits != nil {
-		in, out := &in.DefaultLimits, &out.DefaultLimits
-		*out = new(ClusterLimit)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.DefaultNodeSelector != nil {
-		in, out := &in.DefaultNodeSelector, &out.DefaultNodeSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.AllowedNodeTypes != nil {
-		in, out := &in.AllowedNodeTypes, &out.AllowedNodeTypes
-		*out = make([]ClusterMode, len(*in))
-		copy(*out, *in)
-	}
-	if in.PodSecurityAdmissionLevel != nil {
-		in, out := &in.PodSecurityAdmissionLevel, &out.PodSecurityAdmissionLevel
-		*out = new(PodSecurityAdmissionLevel)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSetSpec.
-func (in *ClusterSetSpec) DeepCopy() *ClusterSetSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSetSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterSetStatus) DeepCopyInto(out *ClusterSetStatus) {
-	*out = *in
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
-		*out = make([]metav1.Condition, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSetStatus.
-func (in *ClusterSetStatus) DeepCopy() *ClusterSetStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterSetStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 	*out = *in
@@ -260,23 +99,6 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 		*out = new(int32)
 		**out = **in
 	}
-	if in.NodeSelector != nil {
-		in, out := &in.NodeSelector, &out.NodeSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.Limit != nil {
-		in, out := &in.Limit, &out.Limit
-		*out = new(ClusterLimit)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.TokenSecretRef != nil {
-		in, out := &in.TokenSecretRef, &out.TokenSecretRef
-		*out = new(v1.SecretReference)
-		**out = **in
-	}
 	if in.ServerArgs != nil {
 		in, out := &in.ServerArgs, &out.ServerArgs
 		*out = make([]string, len(*in))
@@ -297,7 +119,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 		*out = make([]Addon, len(*in))
 		copy(*out, *in)
 	}
-	in.Persistence.DeepCopyInto(&out.Persistence)
+	if in.Persistence != nil {
+		in, out := &in.Persistence, &out.Persistence
+		*out = new(PersistenceConfig)
+		**out = **in
+	}
 	if in.Expose != nil {
 		in, out := &in.Expose, &out.Expose
 		*out = new(ExposeConfig)
@@ -319,12 +145,6 @@ func (in *ClusterSpec) DeepCopy() *ClusterSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
 	*out = *in
-	if in.TLSSANs != nil {
-		in, out := &in.TLSSANs, &out.TLSSANs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.Persistence.DeepCopyInto(&out.Persistence)
 	return
 }
 
@@ -344,7 +164,7 @@ func (in *ExposeConfig) DeepCopyInto(out *ExposeConfig) {
 	if in.Ingress != nil {
 		in, out := &in.Ingress, &out.Ingress
 		*out = new(IngressConfig)
-		(*in).DeepCopyInto(*out)
+		**out = **in
 	}
 	if in.LoadBalancer != nil {
 		in, out := &in.LoadBalancer, &out.LoadBalancer
@@ -354,7 +174,7 @@ func (in *ExposeConfig) DeepCopyInto(out *ExposeConfig) {
 	if in.NodePort != nil {
 		in, out := &in.NodePort, &out.NodePort
 		*out = new(NodePortConfig)
-		(*in).DeepCopyInto(*out)
+		**out = **in
 	}
 	return
 }
@@ -372,13 +192,6 @@ func (in *ExposeConfig) DeepCopy() *ExposeConfig {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *IngressConfig) DeepCopyInto(out *IngressConfig) {
 	*out = *in
-	if in.Annotations != nil {
-		in, out := &in.Annotations, &out.Annotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
 	return
 }
 
@@ -411,21 +224,6 @@ func (in *LoadBalancerConfig) DeepCopy() *LoadBalancerConfig {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NodePortConfig) DeepCopyInto(out *NodePortConfig) {
 	*out = *in
-	if in.ServerPort != nil {
-		in, out := &in.ServerPort, &out.ServerPort
-		*out = new(int32)
-		**out = **in
-	}
-	if in.ServicePort != nil {
-		in, out := &in.ServicePort, &out.ServicePort
-		*out = new(int32)
-		**out = **in
-	}
-	if in.ETCDPort != nil {
-		in, out := &in.ETCDPort, &out.ETCDPort
-		*out = new(int32)
-		**out = **in
-	}
 	return
 }
 
@@ -442,11 +240,6 @@ func (in *NodePortConfig) DeepCopy() *NodePortConfig {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PersistenceConfig) DeepCopyInto(out *PersistenceConfig) {
 	*out = *in
-	if in.StorageClassName != nil {
-		in, out := &in.StorageClassName, &out.StorageClassName
-		*out = new(string)
-		**out = **in
-	}
 	return
 }
 

pkg/buildinfo/buildinfo.go

@@ -1,3 +0,0 @@
-package buildinfo
-
-var Version = "dev"

pkg/controller/certs/certs.go

@@ -1,71 +0,0 @@
-package certs
-
-import (
-	"crypto"
-	"crypto/x509"
-	"fmt"
-	"net"
-	"time"
-
-	certutil "github.com/rancher/dynamiclistener/cert"
-)
-
-func CreateClientCertKey(commonName string, organization []string, altNames *certutil.AltNames, extKeyUsage []x509.ExtKeyUsage, expiresAt time.Duration, caCert, caKey string) ([]byte, []byte, error) {
-	caKeyPEM, err := certutil.ParsePrivateKeyPEM([]byte(caKey))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	caCertPEM, err := certutil.ParseCertsPEM([]byte(caCert))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	b, err := generateKey()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	key, err := certutil.ParsePrivateKeyPEM(b)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	cfg := certutil.Config{
-		CommonName:   commonName,
-		Organization: organization,
-		Usages:       extKeyUsage,
-		ExpiresAt:    expiresAt,
-	}
-	if altNames != nil {
-		cfg.AltNames = *altNames
-	}
-	cert, err := certutil.NewSignedCert(cfg, key.(crypto.Signer), caCertPEM[0], caKeyPEM.(crypto.Signer))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return append(certutil.EncodeCertPEM(cert), certutil.EncodeCertPEM(caCertPEM[0])...), b, nil
-}
-
-func generateKey() (data []byte, err error) {
-	generatedData, err := certutil.MakeEllipticPrivateKeyPEM()
-	if err != nil {
-		return nil, fmt.Errorf("error generating key: %v", err)
-	}
-
-	return generatedData, nil
-}
-
-func AddSANs(sans []string) certutil.AltNames {
-	var altNames certutil.AltNames
-	for _, san := range sans {
-		ip := net.ParseIP(san)
-		if ip == nil {
-			altNames.DNSNames = append(altNames.DNSNames, san)
-		} else {
-			altNames.IPs = append(altNames.IPs, ip)
-		}
-	}
-	return altNames
-}

pkg/controller/cluster/agent/agent.go

@@ -1,55 +1,246 @@
 package agent
 
 import (
-	"context"
-	"fmt"
-
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"github.com/rancher/k3k/pkg/controller/util"
+	apps "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 )
 
-const (
-	configName = "agent-config"
-)
+const agentName = "k3k-agent"
 
-type ResourceEnsurer interface {
-	EnsureResources(context.Context) error
-}
-
-type Config struct {
+type Agent struct {
 	cluster *v1alpha1.Cluster
-	client  ctrlruntimeclient.Client
-	scheme  *runtime.Scheme
 }
 
-func NewConfig(cluster *v1alpha1.Cluster, client ctrlruntimeclient.Client, scheme *runtime.Scheme) *Config {
-	return &Config{
+func New(cluster *v1alpha1.Cluster) *Agent {
+	return &Agent{
 		cluster: cluster,
-		client:  client,
-		scheme:  scheme,
 	}
 }
 
-func configSecretName(clusterName string) string {
-	return controller.SafeConcatNameWithPrefix(clusterName, configName)
+func (a *Agent) Deploy() *apps.Deployment {
+	image := util.K3SImage(a.cluster)
+
+	const name = "k3k-agent"
+
+	return &apps.Deployment{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Deployment",
+			APIVersion: "apps/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      a.cluster.Name + "-" + name,
+			Namespace: util.ClusterNamespace(a.cluster),
+		},
+		Spec: apps.DeploymentSpec{
+			Replicas: a.cluster.Spec.Agents,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"cluster": a.cluster.Name,
+					"type":    "agent",
+				},
+			},
+			Template: v1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"cluster": a.cluster.Name,
+						"type":    "agent",
+					},
+				},
+				Spec: a.podSpec(image, name, a.cluster.Spec.AgentArgs, false),
+			},
+		},
+	}
 }
 
-func ensureObject(ctx context.Context, cfg *Config, obj ctrlruntimeclient.Object) error {
-	log := ctrl.LoggerFrom(ctx)
+func (a *Agent) StatefulAgent(cluster *v1alpha1.Cluster) *apps.StatefulSet {
+	image := util.K3SImage(cluster)
 
-	result, err := controllerutil.CreateOrUpdate(ctx, cfg.client, obj, func() error {
-		return controllerutil.SetControllerReference(cfg.cluster, obj, cfg.scheme)
-	})
+	return &apps.StatefulSet{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Statefulset",
+			APIVersion: "apps/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      cluster.Name + "-" + agentName,
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Spec: apps.StatefulSetSpec{
+			ServiceName: cluster.Name + "-" + agentName + "-headless",
+			Replicas:    cluster.Spec.Agents,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"cluster": cluster.Name,
+					"type":    "agent",
+				},
+			},
+			VolumeClaimTemplates: []v1.PersistentVolumeClaim{
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       "PersistentVolumeClaim",
+						APIVersion: "v1",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "varlibrancherk3s",
+						Namespace: util.ClusterNamespace(cluster),
+					},
+					Spec: v1.PersistentVolumeClaimSpec{
+						AccessModes:      []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+						StorageClassName: &cluster.Spec.Persistence.StorageClassName,
+						Resources: v1.ResourceRequirements{
+							Requests: v1.ResourceList{
+								"storage": resource.MustParse(cluster.Spec.Persistence.StorageRequestSize),
+							},
+						},
+					},
+				},
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       "PersistentVolumeClaim",
+						APIVersion: "v1",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "varlibkubelet",
+						Namespace: util.ClusterNamespace(cluster),
+					},
+					Spec: v1.PersistentVolumeClaimSpec{
+						Resources: v1.ResourceRequirements{
+							Requests: v1.ResourceList{
+								"storage": resource.MustParse(cluster.Spec.Persistence.StorageRequestSize),
+							},
+						},
+						AccessModes:      []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+						StorageClassName: &cluster.Spec.Persistence.StorageClassName,
+					},
+				},
+			},
+			Template: v1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"cluster": cluster.Name,
+						"type":    "agent",
+					},
+				},
+				Spec: a.podSpec(image, agentName, cluster.Spec.AgentArgs, true),
+			},
+		},
+	}
+}
 
-	if result != controllerutil.OperationResultNone {
-		key := client.ObjectKeyFromObject(obj)
-		log.Info(fmt.Sprintf("ensuring %T", obj), "key", key, "result, result")
+func (a *Agent) podSpec(image, name string, args []string, statefulSet bool) v1.PodSpec {
+	args = append([]string{"agent", "--config", "/opt/rancher/k3s/config.yaml"}, args...)
+	podSpec := v1.PodSpec{
+		Volumes: []v1.Volume{
+			{
+				Name: "config",
+				VolumeSource: v1.VolumeSource{
+					Secret: &v1.SecretVolumeSource{
+						SecretName: name + "-config",
+						Items: []v1.KeyToPath{
+							{
+								Key:  "config.yaml",
+								Path: "config.yaml",
+							},
+						},
+					},
+				},
+			},
+			{
+				Name: "run",
+				VolumeSource: v1.VolumeSource{
+					EmptyDir: &v1.EmptyDirVolumeSource{},
+				},
+			},
+			{
+				Name: "varrun",
+				VolumeSource: v1.VolumeSource{
+					EmptyDir: &v1.EmptyDirVolumeSource{},
+				},
+			},
+			{
+				Name: "varlibcni",
+				VolumeSource: v1.VolumeSource{
+					EmptyDir: &v1.EmptyDirVolumeSource{},
+				},
+			},
+			{
+				Name: "varlog",
+				VolumeSource: v1.VolumeSource{
+					EmptyDir: &v1.EmptyDirVolumeSource{},
+				},
+			},
+		},
+		Containers: []v1.Container{
+			{
+				Name:  name,
+				Image: image,
+				SecurityContext: &v1.SecurityContext{
+					Privileged: pointer.Bool(true),
+				},
+				Command: []string{
+					"/bin/k3s",
+				},
+				Args: args,
+				VolumeMounts: []v1.VolumeMount{
+					{
+						Name:      "config",
+						MountPath: "/opt/rancher/k3s/",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "run",
+						MountPath: "/run",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "varrun",
+						MountPath: "/var/run",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "varlibcni",
+						MountPath: "/var/lib/cni",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "varlibkubelet",
+						MountPath: "/var/lib/kubelet",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "varlibrancherk3s",
+						MountPath: "/var/lib/rancher/k3s",
+						ReadOnly:  false,
+					},
+					{
+						Name:      "varlog",
+						MountPath: "/var/log",
+						ReadOnly:  false,
+					},
+				},
+			},
+		},
 	}
 
-	return err
+	if !statefulSet {
+		podSpec.Volumes = append(podSpec.Volumes, v1.Volume{
+			Name: "varlibkubelet",
+			VolumeSource: v1.VolumeSource{
+				EmptyDir: &v1.EmptyDirVolumeSource{},
+			},
+		}, v1.Volume{
+
+			Name: "varlibrancherk3s",
+			VolumeSource: v1.VolumeSource{
+				EmptyDir: &v1.EmptyDirVolumeSource{},
+			},
+		},
+		)
+	}
+
+	return podSpec
 }

pkg/controller/cluster/agent/service.go

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
+	"github.com/rancher/k3k/pkg/controller/util"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func (a *Agent) StatefulAgentService(cluster *v1alpha1.Cluster) *v1.Service {
+	return &v1.Service{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Service",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      cluster.Name + "-" + agentName + "-headless",
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Spec: v1.ServiceSpec{
+			Type:      v1.ServiceTypeClusterIP,
+			ClusterIP: v1.ClusterIPNone,
+			Selector: map[string]string{
+				"cluster": cluster.Name,
+				"role":    "agent",
+			},
+			Ports: []v1.ServicePort{},
+		},
+	}
+}

pkg/controller/cluster/agent/shared.go

@@ -1,469 +0,0 @@
-package agent
-
-import (
-	"context"
-	"crypto"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"time"
-
-	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3k/k3k-kubelet/translate"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/certs"
-	apps "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-const (
-	sharedKubeletConfigPath = "/opt/rancher/k3k/config.yaml"
-	SharedNodeAgentName     = "kubelet"
-	SharedNodeMode          = "shared"
-)
-
-type SharedAgent struct {
-	*Config
-	serviceIP       string
-	image           string
-	imagePullPolicy string
-	token           string
-}
-
-func NewSharedAgent(config *Config, serviceIP, image, imagePullPolicy, token string) *SharedAgent {
-	return &SharedAgent{
-		Config:          config,
-		serviceIP:       serviceIP,
-		image:           image,
-		imagePullPolicy: imagePullPolicy,
-		token:           token,
-	}
-}
-
-func (s *SharedAgent) Name() string {
-	return controller.SafeConcatNameWithPrefix(s.cluster.Name, SharedNodeAgentName)
-}
-
-func (s *SharedAgent) EnsureResources(ctx context.Context) error {
-	if err := errors.Join(
-		s.config(ctx),
-		s.serviceAccount(ctx),
-		s.role(ctx),
-		s.roleBinding(ctx),
-		s.service(ctx),
-		s.deployment(ctx),
-		s.dnsService(ctx),
-		s.webhookTLS(ctx),
-	); err != nil {
-		return fmt.Errorf("failed to ensure some resources: %w\n", err)
-	}
-
-	return nil
-}
-
-func (s *SharedAgent) ensureObject(ctx context.Context, obj ctrlruntimeclient.Object) error {
-	return ensureObject(ctx, s.Config, obj)
-}
-
-func (s *SharedAgent) config(ctx context.Context) error {
-	config := sharedAgentData(s.cluster, s.Name(), s.token, s.serviceIP)
-
-	configSecret := &v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      configSecretName(s.cluster.Name),
-			Namespace: s.cluster.Namespace,
-		},
-		Data: map[string][]byte{
-			"config.yaml": []byte(config),
-		},
-	}
-
-	return s.ensureObject(ctx, configSecret)
-}
-
-func sharedAgentData(cluster *v1alpha1.Cluster, serviceName, token, ip string) string {
-	version := cluster.Spec.Version
-	if cluster.Spec.Version == "" {
-		version = cluster.Status.HostVersion
-	}
-	return fmt.Sprintf(`clusterName: %s
-clusterNamespace: %s
-serverIP: %s
-serviceName: %s
-token: %s
-version: %s`,
-		cluster.Name, cluster.Namespace, ip, serviceName, token, version)
-}
-
-func (s *SharedAgent) deployment(ctx context.Context) error {
-	labels := map[string]string{
-		"cluster": s.cluster.Name,
-		"type":    "agent",
-		"mode":    "shared",
-	}
-
-	deploy := &apps.Deployment{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Deployment",
-			APIVersion: "apps/v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name(),
-			Namespace: s.cluster.Namespace,
-			Labels:    labels,
-		},
-		Spec: apps.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: labels,
-			},
-			Template: v1.PodTemplateSpec{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: labels,
-				},
-				Spec: s.podSpec(),
-			},
-		},
-	}
-
-	return s.ensureObject(ctx, deploy)
-}
-
-func (s *SharedAgent) podSpec() v1.PodSpec {
-	var limit v1.ResourceList
-
-	return v1.PodSpec{
-		ServiceAccountName: s.Name(),
-		Volumes: []v1.Volume{
-			{
-				Name: "config",
-				VolumeSource: v1.VolumeSource{
-					Secret: &v1.SecretVolumeSource{
-						SecretName: configSecretName(s.cluster.Name),
-						Items: []v1.KeyToPath{
-							{
-								Key:  "config.yaml",
-								Path: "config.yaml",
-							},
-						},
-					},
-				},
-			},
-			{
-				Name: "webhook-certs",
-				VolumeSource: v1.VolumeSource{
-					Secret: &v1.SecretVolumeSource{
-						SecretName: WebhookSecretName(s.cluster.Name),
-						Items: []v1.KeyToPath{
-							{
-								Key:  "tls.crt",
-								Path: "tls.crt",
-							},
-							{
-								Key:  "tls.key",
-								Path: "tls.key",
-							},
-							{
-								Key:  "ca.crt",
-								Path: "ca.crt",
-							},
-						},
-					},
-				},
-			},
-		},
-		Containers: []v1.Container{
-			{
-				Name:            s.Name(),
-				Image:           s.image,
-				ImagePullPolicy: v1.PullPolicy(s.imagePullPolicy),
-				Resources: v1.ResourceRequirements{
-					Limits: limit,
-				},
-				Args: []string{
-					"--config",
-					sharedKubeletConfigPath,
-				},
-				Env: []v1.EnvVar{
-					{
-						Name: "AGENT_HOSTNAME",
-						ValueFrom: &v1.EnvVarSource{
-							FieldRef: &v1.ObjectFieldSelector{
-								APIVersion: "v1",
-								FieldPath:  "spec.nodeName",
-							},
-						},
-					},
-				},
-				VolumeMounts: []v1.VolumeMount{
-					{
-						Name:      "config",
-						MountPath: "/opt/rancher/k3k/",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "webhook-certs",
-						MountPath: "/opt/rancher/k3k-webhook",
-						ReadOnly:  false,
-					},
-				},
-				Ports: []v1.ContainerPort{
-					{
-						Name:          "webhook-port",
-						Protocol:      v1.ProtocolTCP,
-						ContainerPort: 9443,
-					},
-				},
-			},
-		},
-	}
-}
-
-func (s *SharedAgent) service(ctx context.Context) error {
-	svc := &v1.Service{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Service",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name(),
-			Namespace: s.cluster.Namespace,
-		},
-		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeClusterIP,
-			Selector: map[string]string{
-				"cluster": s.cluster.Name,
-				"type":    "agent",
-				"mode":    "shared",
-			},
-			Ports: []v1.ServicePort{
-				{
-					Name:     "k3s-kubelet-port",
-					Protocol: v1.ProtocolTCP,
-					Port:     10250,
-				},
-				{
-					Name:       "webhook-server",
-					Protocol:   v1.ProtocolTCP,
-					Port:       9443,
-					TargetPort: intstr.FromInt32(9443),
-				},
-			},
-		},
-	}
-
-	return s.ensureObject(ctx, svc)
-}
-
-func (s *SharedAgent) dnsService(ctx context.Context) error {
-	dnsServiceName := controller.SafeConcatNameWithPrefix(s.cluster.Name, "kube-dns")
-
-	svc := &v1.Service{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Service",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      dnsServiceName,
-			Namespace: s.cluster.Namespace,
-		},
-		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeClusterIP,
-			Selector: map[string]string{
-				translate.ClusterNameLabel: s.cluster.Name,
-				"k8s-app":                  "kube-dns",
-			},
-			Ports: []v1.ServicePort{
-				{
-					Name:       "dns",
-					Protocol:   v1.ProtocolUDP,
-					Port:       53,
-					TargetPort: intstr.FromInt32(53),
-				},
-				{
-					Name:       "dns-tcp",
-					Protocol:   v1.ProtocolTCP,
-					Port:       53,
-					TargetPort: intstr.FromInt32(53),
-				},
-				{
-					Name:       "metrics",
-					Protocol:   v1.ProtocolTCP,
-					Port:       9153,
-					TargetPort: intstr.FromInt32(9153),
-				},
-			},
-		},
-	}
-
-	return s.ensureObject(ctx, svc)
-}
-
-func (s *SharedAgent) serviceAccount(ctx context.Context) error {
-	svcAccount := &v1.ServiceAccount{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ServiceAccount",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name(),
-			Namespace: s.cluster.Namespace,
-		},
-	}
-
-	return s.ensureObject(ctx, svcAccount)
-}
-
-func (s *SharedAgent) role(ctx context.Context) error {
-	role := &rbacv1.Role{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Role",
-			APIVersion: "rbac.authorization.k8s.io/v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name(),
-			Namespace: s.cluster.Namespace,
-		},
-		Rules: []rbacv1.PolicyRule{
-			{
-				APIGroups: []string{""},
-				Resources: []string{"persistentvolumeclaims", "pods", "pods/log", "pods/exec", "secrets", "configmaps", "services"},
-				Verbs:     []string{"*"},
-			},
-			{
-				APIGroups: []string{"k3k.io"},
-				Resources: []string{"clusters"},
-				Verbs:     []string{"get", "watch", "list"},
-			},
-		},
-	}
-
-	return s.ensureObject(ctx, role)
-}
-
-func (s *SharedAgent) roleBinding(ctx context.Context) error {
-	roleBinding := &rbacv1.RoleBinding{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "RoleBinding",
-			APIVersion: "rbac.authorization.k8s.io/v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      s.Name(),
-			Namespace: s.cluster.Namespace,
-		},
-		RoleRef: rbacv1.RoleRef{
-			APIGroup: "rbac.authorization.k8s.io",
-			Kind:     "Role",
-			Name:     s.Name(),
-		},
-		Subjects: []rbacv1.Subject{
-			{
-				Kind:      "ServiceAccount",
-				Name:      s.Name(),
-				Namespace: s.cluster.Namespace,
-			},
-		},
-	}
-
-	return s.ensureObject(ctx, roleBinding)
-}
-
-func (s *SharedAgent) webhookTLS(ctx context.Context) error {
-	webhookSecret := &v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      WebhookSecretName(s.cluster.Name),
-			Namespace: s.cluster.Namespace,
-		},
-	}
-
-	key := client.ObjectKeyFromObject(webhookSecret)
-	if err := s.client.Get(ctx, key, webhookSecret); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return err
-		}
-
-		caPrivateKeyPEM, caCertPEM, err := newWebhookSelfSignedCACerts()
-		if err != nil {
-			return err
-		}
-
-		altNames := []string{s.Name(), s.cluster.Name}
-		webhookCert, webhookKey, err := newWebhookCerts(s.Name(), altNames, caPrivateKeyPEM, caCertPEM)
-		if err != nil {
-			return err
-		}
-
-		webhookSecret.Data = map[string][]byte{
-			"tls.crt": webhookCert,
-			"tls.key": webhookKey,
-			"ca.crt":  caCertPEM,
-			"ca.key":  caPrivateKeyPEM,
-		}
-
-		return s.ensureObject(ctx, webhookSecret)
-	}
-
-	// if the webhook secret is found we can skip
-	// we should check for their validity
-	return nil
-}
-
-func newWebhookSelfSignedCACerts() ([]byte, []byte, error) {
-	// generate CA CERT/KEY
-	caPrivateKeyPEM, err := certutil.MakeEllipticPrivateKeyPEM()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	caPrivateKey, err := certutil.ParsePrivateKeyPEM(caPrivateKeyPEM)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	cfg := certutil.Config{
-		CommonName: fmt.Sprintf("k3k-webhook-ca@%d", time.Now().Unix()),
-	}
-
-	caCert, err := certutil.NewSelfSignedCACert(cfg, caPrivateKey.(crypto.Signer))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	caCertPEM := certutil.EncodeCertPEM(caCert)
-
-	return caPrivateKeyPEM, caCertPEM, nil
-}
-
-func newWebhookCerts(commonName string, subAltNames []string, caPrivateKey, caCert []byte) ([]byte, []byte, error) {
-	// generate webhook cert bundle
-	altNames := certs.AddSANs(subAltNames)
-	oneYearExpiration := time.Until(time.Now().AddDate(1, 0, 0))
-
-	return certs.CreateClientCertKey(
-		commonName,
-		nil,
-		&altNames,
-		[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		oneYearExpiration,
-		string(caCert),
-		string(caPrivateKey),
-	)
-}
-
-func WebhookSecretName(clusterName string) string {
-	return controller.SafeConcatNameWithPrefix(clusterName, "webhook")
-}

pkg/controller/cluster/agent/shared_test.go

@@ -1,114 +0,0 @@
-package agent
-
-import (
-	"testing"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func Test_sharedAgentData(t *testing.T) {
-	type args struct {
-		cluster     *v1alpha1.Cluster
-		serviceName string
-		ip          string
-		token       string
-	}
-	tests := []struct {
-		name         string
-		args         args
-		expectedData map[string]string
-	}{
-		{
-			name: "simple config",
-			args: args{
-				cluster: &v1alpha1.Cluster{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "mycluster",
-						Namespace: "ns-1",
-					},
-					Spec: v1alpha1.ClusterSpec{
-						Version: "v1.2.3",
-					},
-				},
-				ip:          "10.0.0.21",
-				serviceName: "service-name",
-				token:       "dnjklsdjnksd892389238",
-			},
-			expectedData: map[string]string{
-				"clusterName":      "mycluster",
-				"clusterNamespace": "ns-1",
-				"serverIP":         "10.0.0.21",
-				"serviceName":      "service-name",
-				"token":            "dnjklsdjnksd892389238",
-				"version":          "v1.2.3",
-			},
-		},
-		{
-			name: "version in status",
-			args: args{
-				cluster: &v1alpha1.Cluster{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "mycluster",
-						Namespace: "ns-1",
-					},
-					Spec: v1alpha1.ClusterSpec{
-						Version: "v1.2.3",
-					},
-					Status: v1alpha1.ClusterStatus{
-						HostVersion: "v1.3.3",
-					},
-				},
-				ip:          "10.0.0.21",
-				serviceName: "service-name",
-				token:       "dnjklsdjnksd892389238",
-			},
-			expectedData: map[string]string{
-				"clusterName":      "mycluster",
-				"clusterNamespace": "ns-1",
-				"serverIP":         "10.0.0.21",
-				"serviceName":      "service-name",
-				"token":            "dnjklsdjnksd892389238",
-				"version":          "v1.2.3",
-			},
-		},
-		{
-			name: "missing version in spec",
-			args: args{
-				cluster: &v1alpha1.Cluster{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "mycluster",
-						Namespace: "ns-1",
-					},
-					Status: v1alpha1.ClusterStatus{
-						HostVersion: "v1.3.3",
-					},
-				},
-				ip:          "10.0.0.21",
-				serviceName: "service-name",
-				token:       "dnjklsdjnksd892389238",
-			},
-			expectedData: map[string]string{
-				"clusterName":      "mycluster",
-				"clusterNamespace": "ns-1",
-				"serverIP":         "10.0.0.21",
-				"serviceName":      "service-name",
-				"token":            "dnjklsdjnksd892389238",
-				"version":          "v1.3.3",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			config := sharedAgentData(tt.args.cluster, tt.args.serviceName, tt.args.token, tt.args.ip)
-
-			data := make(map[string]string)
-			err := yaml.Unmarshal([]byte(config), data)
-
-			assert.NoError(t, err)
-			assert.Equal(t, tt.expectedData, data)
-		})
-	}
-}

pkg/controller/cluster/agent/virtual.go

@@ -1,229 +0,0 @@
-package agent
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/rancher/k3k/pkg/controller"
-	apps "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-const (
-	VirtualNodeMode      = "virtual"
-	virtualNodeAgentName = "agent"
-)
-
-type VirtualAgent struct {
-	*Config
-	serviceIP string
-	token     string
-}
-
-func NewVirtualAgent(config *Config, serviceIP, token string) *VirtualAgent {
-	return &VirtualAgent{
-		Config:    config,
-		serviceIP: serviceIP,
-		token:     token,
-	}
-}
-
-func (v *VirtualAgent) Name() string {
-	return controller.SafeConcatNameWithPrefix(v.cluster.Name, virtualNodeAgentName)
-}
-
-func (v *VirtualAgent) EnsureResources(ctx context.Context) error {
-	if err := errors.Join(
-		v.config(ctx),
-		v.deployment(ctx),
-	); err != nil {
-		return fmt.Errorf("failed to ensure some resources: %w\n", err)
-	}
-
-	return nil
-}
-
-func (v *VirtualAgent) ensureObject(ctx context.Context, obj ctrlruntimeclient.Object) error {
-	return ensureObject(ctx, v.Config, obj)
-}
-
-func (v *VirtualAgent) config(ctx context.Context) error {
-	config := virtualAgentData(v.serviceIP, v.token)
-
-	configSecret := &v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      configSecretName(v.cluster.Name),
-			Namespace: v.cluster.Namespace,
-		},
-		Data: map[string][]byte{
-			"config.yaml": []byte(config),
-		},
-	}
-
-	return v.ensureObject(ctx, configSecret)
-}
-
-func virtualAgentData(serviceIP, token string) string {
-	return fmt.Sprintf(`server: https://%s:6443
-token: %s
-with-node-id: true`, serviceIP, token)
-}
-
-func (v *VirtualAgent) deployment(ctx context.Context) error {
-	image := controller.K3SImage(v.cluster)
-
-	const name = "k3k-agent"
-	selector := metav1.LabelSelector{
-		MatchLabels: map[string]string{
-			"cluster": v.cluster.Name,
-			"type":    "agent",
-			"mode":    "virtual",
-		},
-	}
-
-	deployment := &apps.Deployment{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Deployment",
-			APIVersion: "apps/v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      v.Name(),
-			Namespace: v.cluster.Namespace,
-			Labels:    selector.MatchLabels,
-		},
-		Spec: apps.DeploymentSpec{
-			Replicas: v.cluster.Spec.Agents,
-			Selector: &selector,
-			Template: v1.PodTemplateSpec{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: selector.MatchLabels,
-				},
-				Spec: v.podSpec(image, name, v.cluster.Spec.AgentArgs, &selector),
-			},
-		},
-	}
-
-	return v.ensureObject(ctx, deployment)
-}
-
-func (v *VirtualAgent) podSpec(image, name string, args []string, affinitySelector *metav1.LabelSelector) v1.PodSpec {
-	var limit v1.ResourceList
-	args = append([]string{"agent", "--config", "/opt/rancher/k3s/config.yaml"}, args...)
-	podSpec := v1.PodSpec{
-		Volumes: []v1.Volume{
-			{
-				Name: "config",
-				VolumeSource: v1.VolumeSource{
-					Secret: &v1.SecretVolumeSource{
-						SecretName: configSecretName(v.cluster.Name),
-						Items: []v1.KeyToPath{
-							{
-								Key:  "config.yaml",
-								Path: "config.yaml",
-							},
-						},
-					},
-				},
-			},
-			{
-				Name: "run",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-			{
-				Name: "varrun",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-			{
-				Name: "varlibcni",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-			{
-				Name: "varlog",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-			{
-				Name: "varlibkubelet",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-			{
-				Name: "varlibrancherk3s",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
-		},
-		Containers: []v1.Container{
-			{
-				Name:  name,
-				Image: image,
-				SecurityContext: &v1.SecurityContext{
-					Privileged: ptr.To(true),
-				},
-				Args: args,
-				Command: []string{
-					"/bin/k3s",
-				},
-				Resources: v1.ResourceRequirements{
-					Limits: limit,
-				},
-				VolumeMounts: []v1.VolumeMount{
-					{
-						Name:      "config",
-						MountPath: "/opt/rancher/k3s/",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "run",
-						MountPath: "/run",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "varrun",
-						MountPath: "/var/run",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "varlibcni",
-						MountPath: "/var/lib/cni",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "varlibkubelet",
-						MountPath: "/var/lib/kubelet",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "varlibrancherk3s",
-						MountPath: "/var/lib/rancher/k3s",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "varlog",
-						MountPath: "/var/log",
-						ReadOnly:  false,
-					},
-				},
-			},
-		},
-	}
-
-	return podSpec
-}

pkg/controller/cluster/agent/virtual_test.go

@@ -1,44 +0,0 @@
-package agent
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
-)
-
-func Test_virtualAgentData(t *testing.T) {
-	type args struct {
-		serviceIP string
-		token     string
-	}
-	tests := []struct {
-		name         string
-		args         args
-		expectedData map[string]string
-	}{
-		{
-			name: "simple config",
-			args: args{
-				serviceIP: "10.0.0.21",
-				token:     "dnjklsdjnksd892389238",
-			},
-			expectedData: map[string]string{
-				"server":       "https://10.0.0.21:6443",
-				"token":        "dnjklsdjnksd892389238",
-				"with-node-id": "true",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			config := virtualAgentData(tt.args.serviceIP, tt.args.token)
-
-			data := make(map[string]string)
-			err := yaml.Unmarshal([]byte(config), data)
-
-			assert.NoError(t, err)
-			assert.Equal(t, tt.expectedData, data)
-		})
-	}
-}

pkg/controller/cluster/cluster.go

@@ -2,170 +2,124 @@ package cluster
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"reflect"
-	"strings"
-	"time"
 
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
 	"github.com/rancher/k3k/pkg/controller/cluster/agent"
+	"github.com/rancher/k3k/pkg/controller/cluster/config"
 	"github.com/rancher/k3k/pkg/controller/cluster/server"
-	"github.com/rancher/k3k/pkg/controller/cluster/server/bootstrap"
-	apps "k8s.io/api/apps/v1"
+	"github.com/rancher/k3k/pkg/controller/util"
 	v1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/discovery"
-	ctrl "sigs.k8s.io/controller-runtime"
+	"k8s.io/klog"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	ctrlruntimecontroller "sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 const (
-	namePrefix           = "k3k"
 	clusterController    = "k3k-cluster-controller"
 	clusterFinalizerName = "cluster.k3k.io/finalizer"
-	etcdPodFinalizerName = "etcdpod.k3k.io/finalizer"
-	ClusterInvalidName   = "system"
+	EphermalNodesType    = "ephermal"
+	DynamicNodesType     = "dynamic"
 
 	maxConcurrentReconciles = 1
 
-	defaultClusterCIDR           = "10.44.0.0/16"
-	defaultClusterServiceCIDR    = "10.45.0.0/16"
-	defaultStoragePersistentSize = "1G"
-	memberRemovalTimeout         = time.Minute * 1
+	defaultClusterCIDR        = "10.44.0.0/16"
+	defaultClusterServiceCIDR = "10.45.0.0/16"
 )
 
 type ClusterReconciler struct {
-	DiscoveryClient            *discovery.DiscoveryClient
-	Client                     ctrlruntimeclient.Client
-	Scheme                     *runtime.Scheme
-	SharedAgentImage           string
-	SharedAgentImagePullPolicy string
+	Client client.Client
+	Scheme *runtime.Scheme
 }
 
 // Add adds a new controller to the manager
-func Add(ctx context.Context, mgr manager.Manager, sharedAgentImage, sharedAgentImagePullPolicy string) error {
-	discoveryClient, err := discovery.NewDiscoveryClientForConfig(mgr.GetConfig())
+func Add(ctx context.Context, mgr manager.Manager) error {
+	// initialize a new Reconciler
+	reconciler := ClusterReconciler{
+		Client: mgr.GetClient(),
+		Scheme: mgr.GetScheme(),
+	}
+
+	// create a new controller and add it to the manager
+	//this can be replaced by the new builder functionality in controller-runtime
+	controller, err := controller.New(clusterController, mgr, controller.Options{
+		Reconciler:              &reconciler,
+		MaxConcurrentReconciles: maxConcurrentReconciles,
+	})
 	if err != nil {
 		return err
 	}
 
-	if sharedAgentImage == "" {
-		return errors.New("missing shared agent image")
-	}
-
-	// initialize a new Reconciler
-	reconciler := ClusterReconciler{
-		DiscoveryClient:            discoveryClient,
-		Client:                     mgr.GetClient(),
-		Scheme:                     mgr.GetScheme(),
-		SharedAgentImage:           sharedAgentImage,
-		SharedAgentImagePullPolicy: sharedAgentImagePullPolicy,
-	}
-
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&v1alpha1.Cluster{}).
-		WithOptions(ctrlruntimecontroller.Options{
-			MaxConcurrentReconciles: maxConcurrentReconciles,
-		}).
-		Owns(&apps.StatefulSet{}).
-		Complete(&reconciler)
+	return controller.Watch(&source.Kind{Type: &v1alpha1.Cluster{}}, &handler.EnqueueRequestForObject{})
 }
 
 func (c *ClusterReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	log := ctrl.LoggerFrom(ctx).WithValues("cluster", req.NamespacedName)
-	ctx = ctrl.LoggerInto(ctx, log) // enrich the current logger
-
-	log.Info("reconciling cluster")
-
 	var cluster v1alpha1.Cluster
+
 	if err := c.Client.Get(ctx, req.NamespacedName, &cluster); err != nil {
-		return reconcile.Result{}, err
+		return reconcile.Result{}, client.IgnoreNotFound(err)
 	}
 
-	// if DeletionTimestamp is not Zero -> finalize the object
-	if !cluster.DeletionTimestamp.IsZero() {
-		return c.finalizeCluster(ctx, cluster)
+	if cluster.DeletionTimestamp.IsZero() {
+		if !controllerutil.ContainsFinalizer(&cluster, clusterFinalizerName) {
+			controllerutil.AddFinalizer(&cluster, clusterFinalizerName)
+			if err := c.Client.Update(ctx, &cluster); err != nil {
+				return reconcile.Result{}, err
+			}
+		}
+
+		// we create a namespace for each new cluster
+		var ns v1.Namespace
+		objKey := client.ObjectKey{
+			Name: util.ClusterNamespace(&cluster),
+		}
+		if err := c.Client.Get(ctx, objKey, &ns); err != nil {
+			if !apierrors.IsNotFound(err) {
+				return reconcile.Result{}, util.LogAndReturnErr("failed to get cluster namespace "+util.ClusterNamespace(&cluster), err)
+			}
+		}
+
+		klog.Infof("enqueue cluster [%s]", cluster.Name)
+
+		return reconcile.Result{}, c.createCluster(ctx, &cluster)
 	}
 
-	// add finalizers
-	if !controllerutil.AddFinalizer(&cluster, clusterFinalizerName) {
-		if err := c.Client.Update(ctx, &cluster); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-
-	orig := cluster.DeepCopy()
-
-	reconcilerErr := c.reconcileCluster(ctx, &cluster)
-
-	// update Status if needed
-	if !reflect.DeepEqual(orig.Status, cluster.Status) {
-		if err := c.Client.Status().Update(ctx, &cluster); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-
-	// if there was an error during the reconciliation, return
-	if reconcilerErr != nil {
-		return reconcile.Result{}, reconcilerErr
-	}
-
-	// update Cluster if needed
-	if !reflect.DeepEqual(orig.Spec, cluster.Spec) {
+	if controllerutil.ContainsFinalizer(&cluster, clusterFinalizerName) {
+		// remove our finalizer from the list and update it.
+		controllerutil.RemoveFinalizer(&cluster, clusterFinalizerName)
 		if err := c.Client.Update(ctx, &cluster); err != nil {
 			return reconcile.Result{}, err
 		}
 	}
+	klog.Infof("deleting cluster [%s]", cluster.Name)
 
 	return reconcile.Result{}, nil
 }
 
-func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alpha1.Cluster) error {
-	log := ctrl.LoggerFrom(ctx)
+func (c *ClusterReconciler) createCluster(ctx context.Context, cluster *v1alpha1.Cluster) error {
+	server := server.New(cluster, c.Client)
+	agent := agent.New(cluster)
 
-	// if the Version is not specified we will try to use the same Kubernetes version of the host.
-	// This version is stored in the Status object, and it will not be updated if already set.
-	if cluster.Spec.Version == "" && cluster.Status.HostVersion == "" {
-		log.Info("cluster version not set")
-
-		hostVersion, err := c.DiscoveryClient.ServerVersion()
-		if err != nil {
-			return err
+	if cluster.Spec.Persistence == nil {
+		// default to ephermal nodes
+		cluster.Spec.Persistence = &v1alpha1.PersistenceConfig{
+			Type: EphermalNodesType,
 		}
-
-		// update Status HostVersion
-		k8sVersion := strings.Split(hostVersion.GitVersion, "+")[0]
-		cluster.Status.HostVersion = k8sVersion + "-k3s1"
 	}
-
-	// TODO: update status?
-	if err := c.validate(cluster); err != nil {
-		log.Error(err, "invalid change")
-		return nil
+	if err := c.Client.Update(ctx, cluster); err != nil {
+		return util.LogAndReturnErr("failed to update cluster with persistence type", err)
 	}
-
-	token, err := c.token(ctx, cluster)
-	if err != nil {
-		return err
-	}
-
-	s := server.New(cluster, c.Client, token, string(cluster.Spec.Mode))
-
-	cluster.Status.Persistence = cluster.Spec.Persistence
-	if cluster.Spec.Persistence.StorageRequestSize == "" {
-		// default to 1G of request size
-		cluster.Status.Persistence.StorageRequestSize = defaultStoragePersistentSize
+	// create a new namespace for the cluster
+	if err := c.createNamespace(ctx, cluster); err != nil {
+		return util.LogAndReturnErr("failed to create ns", err)
 	}
 
 	cluster.Status.ClusterCIDR = cluster.Spec.ClusterCIDR
@@ -178,68 +132,83 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alp
 		cluster.Status.ServiceCIDR = defaultClusterServiceCIDR
 	}
 
-	service, err := c.ensureClusterService(ctx, cluster)
+	klog.Infof("creating cluster service")
+	serviceIP, err := c.createClusterService(ctx, cluster, server)
 	if err != nil {
-		return err
-	}
-	serviceIP := service.Spec.ClusterIP
-
-	if err := c.createClusterConfigs(ctx, cluster, s, serviceIP); err != nil {
-		return err
+		return util.LogAndReturnErr("failed to create cluster service", err)
 	}
 
-	if err := c.server(ctx, cluster, s); err != nil {
-		return err
+	if err := c.createClusterConfigs(ctx, cluster, serviceIP); err != nil {
+		return util.LogAndReturnErr("failed to create cluster configs", err)
 	}
 
-	if err := c.ensureAgent(ctx, cluster, serviceIP, token); err != nil {
-		return err
+	// creating statefulsets in case the user chose a persistence type other than ephermal
+	if cluster.Spec.Persistence.Type != EphermalNodesType {
+		if cluster.Spec.Persistence.StorageRequestSize == "" {
+			// default to 1G of request size
+			cluster.Spec.Persistence.StorageRequestSize = "1G"
+		}
+		if err := c.createStatefulSets(ctx, cluster, server, agent); err != nil {
+			return util.LogAndReturnErr("failed to create servers and agents statefulsets", err)
+		}
+	} else {
+		if err := c.createDeployments(ctx, cluster, server); err != nil {
+			return util.LogAndReturnErr("failed to create servers and agents deployment", err)
+		}
 	}
 
-	if err := c.ensureIngress(ctx, cluster); err != nil {
-		return err
+	if cluster.Spec.Expose != nil {
+		if cluster.Spec.Expose.Ingress != nil {
+			serverIngress, err := server.Ingress(ctx, c.Client)
+			if err != nil {
+				return util.LogAndReturnErr("failed to create ingress object", err)
+			}
+
+			if err := c.Client.Create(ctx, serverIngress); err != nil {
+				if !apierrors.IsAlreadyExists(err) {
+					return util.LogAndReturnErr("failed to create server ingress", err)
+				}
+			}
+		}
 	}
 
-	if err := c.ensureBootstrapSecret(ctx, cluster, serviceIP, token); err != nil {
-		return err
+	kubeconfigSecret, err := server.GenerateNewKubeConfig(ctx, serviceIP)
+	if err != nil {
+		return util.LogAndReturnErr("failed to generate new kubeconfig", err)
 	}
 
-	return c.bindNodeProxyClusterRole(ctx, cluster)
+	if err := c.Client.Create(ctx, kubeconfigSecret); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return util.LogAndReturnErr("failed to create kubeconfig secret", err)
+		}
+	}
+
+	return c.Client.Update(ctx, cluster)
 }
 
-// ensureBootstrapSecret will create or update the Secret containing the bootstrap data from the k3s server
-func (c *ClusterReconciler) ensureBootstrapSecret(ctx context.Context, cluster *v1alpha1.Cluster, serviceIP, token string) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("ensuring bootstrap secret")
-
-	bootstrapData, err := bootstrap.GenerateBootstrapData(ctx, cluster, serviceIP, token)
-	if err != nil {
-		return err
-	}
-
-	bootstrapSecret := &v1.Secret{
+func (c *ClusterReconciler) createNamespace(ctx context.Context, cluster *v1alpha1.Cluster) error {
+	// create a new namespace for the cluster
+	namespace := v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      controller.SafeConcatNameWithPrefix(cluster.Name, "bootstrap"),
-			Namespace: cluster.Namespace,
+			Name: util.ClusterNamespace(cluster),
 		},
 	}
+	if err := controllerutil.SetControllerReference(cluster, &namespace, c.Scheme); err != nil {
+		return err
+	}
 
-	_, err = controllerutil.CreateOrUpdate(ctx, c.Client, bootstrapSecret, func() error {
-		if err := controllerutil.SetControllerReference(cluster, bootstrapSecret, c.Scheme); err != nil {
-			return err
+	if err := c.Client.Create(ctx, &namespace); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return util.LogAndReturnErr("failed to create ns", err)
 		}
+	}
 
-		bootstrapSecret.Data = map[string][]byte{
-			"bootstrap": bootstrapData,
-		}
-		return nil
-	})
-	return err
+	return nil
 }
 
-func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server, serviceIP string) error {
+func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v1alpha1.Cluster, serviceIP string) error {
 	// create init node config
-	initServerConfig, err := server.Config(true, serviceIP)
+	initServerConfig, err := config.Server(cluster, true, serviceIP)
 	if err != nil {
 		return err
 	}
@@ -255,7 +224,7 @@ func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v
 	}
 
 	// create servers configuration
-	serverConfig, err := server.Config(false, serviceIP)
+	serverConfig, err := config.Server(cluster, false, serviceIP)
 	if err != nil {
 		return err
 	}
@@ -268,76 +237,125 @@ func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v
 		}
 	}
 
+	// create agents configuration
+	agentsConfig := agentConfig(cluster, serviceIP)
+	if err := controllerutil.SetControllerReference(cluster, &agentsConfig, c.Scheme); err != nil {
+		return err
+	}
+	if err := c.Client.Create(ctx, &agentsConfig); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+
 	return nil
 }
 
-func (c *ClusterReconciler) ensureClusterService(ctx context.Context, cluster *v1alpha1.Cluster) (*v1.Service, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("ensuring cluster service")
+func (c *ClusterReconciler) createClusterService(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server) (string, error) {
+	// create cluster service
+	clusterService := server.Service(cluster)
 
-	expectedService := server.Service(cluster)
-
-	currentService := expectedService.DeepCopy()
-	result, err := controllerutil.CreateOrUpdate(ctx, c.Client, currentService, func() error {
-		if err := controllerutil.SetControllerReference(cluster, currentService, c.Scheme); err != nil {
-			return err
+	if err := controllerutil.SetControllerReference(cluster, clusterService, c.Scheme); err != nil {
+		return "", err
+	}
+	if err := c.Client.Create(ctx, clusterService); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return "", err
 		}
-
-		currentService.Spec = expectedService.Spec
-		return nil
-	})
-	if err != nil {
-		return nil, err
 	}
 
-	key := client.ObjectKeyFromObject(currentService)
-	if result != controllerutil.OperationResultNone {
-		log.Info("cluster service updated", "key", key, "result", result)
+	var service v1.Service
+
+	objKey := client.ObjectKey{
+		Namespace: util.ClusterNamespace(cluster),
+		Name:      "k3k-server-service",
+	}
+	if err := c.Client.Get(ctx, objKey, &service); err != nil {
+		return "", err
 	}
 
-	return currentService, nil
+	return service.Spec.ClusterIP, nil
 }
 
-func (c *ClusterReconciler) ensureIngress(ctx context.Context, cluster *v1alpha1.Cluster) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("ensuring cluster ingress")
-
-	expectedServerIngress := server.Ingress(ctx, cluster)
-
-	// delete existing Ingress if Expose or IngressConfig are nil
-	if cluster.Spec.Expose == nil || cluster.Spec.Expose.Ingress == nil {
-		err := c.Client.Delete(ctx, &expectedServerIngress)
-		return client.IgnoreNotFound(err)
-	}
-
-	currentServerIngress := expectedServerIngress.DeepCopy()
-	result, err := controllerutil.CreateOrUpdate(ctx, c.Client, currentServerIngress, func() error {
-		if err := controllerutil.SetControllerReference(cluster, currentServerIngress, c.Scheme); err != nil {
-			return err
-		}
-
-		currentServerIngress.Spec = expectedServerIngress.Spec
-		currentServerIngress.Annotations = expectedServerIngress.Annotations
-
-		return nil
-	})
+func (c *ClusterReconciler) createDeployments(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server) error {
+	// create deployment for the init server
+	// the init deployment must have only 1 replica
+	initServerDeployment, err := server.Deploy(ctx, true)
 	if err != nil {
 		return err
 	}
 
-	key := client.ObjectKeyFromObject(currentServerIngress)
-	if result != controllerutil.OperationResultNone {
-		log.Info("cluster ingress updated", "key", key, "result", result)
+	if err := controllerutil.SetControllerReference(cluster, initServerDeployment, c.Scheme); err != nil {
+		return err
+	}
+
+	if err := c.Client.Create(ctx, initServerDeployment); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+
+	// create deployment for the rest of the servers
+	serversDeployment, err := server.Deploy(ctx, false)
+	if err != nil {
+		return err
+	}
+
+	if err := controllerutil.SetControllerReference(cluster, serversDeployment, c.Scheme); err != nil {
+		return err
+	}
+
+	if err := c.Client.Create(ctx, serversDeployment); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+
+	agent := agent.New(cluster)
+
+	agentsDeployment := agent.Deploy()
+	if err := controllerutil.SetControllerReference(cluster, agentsDeployment, c.Scheme); err != nil {
+		return err
+	}
+
+	if err := c.Client.Create(ctx, agentsDeployment); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
 	}
 
 	return nil
 }
 
-func (c *ClusterReconciler) server(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server) error {
-	log := ctrl.LoggerFrom(ctx)
+func (c *ClusterReconciler) createStatefulSets(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server, agent *agent.Agent) error {
+	// create headless service for the init statefulset
+	initServerStatefulService := server.StatefulServerService(cluster, true)
+	if err := controllerutil.SetControllerReference(cluster, initServerStatefulService, c.Scheme); err != nil {
+		return err
+	}
+	if err := c.Client.Create(ctx, initServerStatefulService); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
 
-	// create headless service for the statefulset
-	serverStatefulService := server.StatefulServerService()
+	// create statefulsets for the init server
+	// the init statefulset must have only 1 replica
+	initServerStatefulSet := server.StatefulServer(ctx, cluster, true)
+
+	if err := controllerutil.SetControllerReference(cluster, initServerStatefulSet, c.Scheme); err != nil {
+		return err
+	}
+
+	if err := c.Client.Create(ctx, initServerStatefulSet); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+
+	// create statefulset for the rest of the servers
+	// create headless service for the server statefulset
+	serverStatefulService := server.StatefulServerService(cluster, false)
 	if err := controllerutil.SetControllerReference(cluster, serverStatefulService, c.Scheme); err != nil {
 		return err
 	}
@@ -346,66 +364,96 @@ func (c *ClusterReconciler) server(ctx context.Context, cluster *v1alpha1.Cluste
 			return err
 		}
 	}
+	serversStatefulSet := server.StatefulServer(ctx, cluster, false)
 
-	serverStatefulSet, err := server.StatefulServer(ctx)
-	if err != nil {
+	if err := controllerutil.SetControllerReference(cluster, serversStatefulSet, c.Scheme); err != nil {
 		return err
 	}
 
-	result, err := controllerutil.CreateOrUpdate(ctx, c.Client, serverStatefulSet, func() error {
-		return controllerutil.SetControllerReference(cluster, serverStatefulSet, c.Scheme)
-	})
-
-	if result != controllerutil.OperationResultNone {
-		key := client.ObjectKeyFromObject(serverStatefulSet)
-		log.Info("ensuring serverStatefulSet", "key", key, "result", result)
-	}
-
-	return err
-}
-
-func (c *ClusterReconciler) bindNodeProxyClusterRole(ctx context.Context, cluster *v1alpha1.Cluster) error {
-	clusterRoleBinding := &rbacv1.ClusterRoleBinding{}
-	if err := c.Client.Get(ctx, types.NamespacedName{Name: "k3k-node-proxy"}, clusterRoleBinding); err != nil {
-		return fmt.Errorf("failed to get or find k3k-node-proxy ClusterRoleBinding: %w", err)
-	}
-
-	subjectName := controller.SafeConcatNameWithPrefix(cluster.Name, agent.SharedNodeAgentName)
-
-	found := false
-	for _, subject := range clusterRoleBinding.Subjects {
-		if subject.Name == subjectName && subject.Namespace == cluster.Namespace {
-			found = true
+	if err := c.Client.Create(ctx, serversStatefulSet); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
 		}
 	}
 
-	if !found {
-		clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1.Subject{
-			Kind:      "ServiceAccount",
-			Name:      subjectName,
-			Namespace: cluster.Namespace,
-		})
+	// create headless service for the agents statefulset
+	agentStatefulService := agent.StatefulAgentService(cluster)
+	if err := controllerutil.SetControllerReference(cluster, agentStatefulService, c.Scheme); err != nil {
+		return err
+	}
+	if err := c.Client.Create(ctx, agentStatefulService); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+	agentsStatefulSet := agent.StatefulAgent(cluster)
+	if err := controllerutil.SetControllerReference(cluster, agentsStatefulSet, c.Scheme); err != nil {
+		return err
 	}
 
-	return c.Client.Update(ctx, clusterRoleBinding)
-}
-
-func (c *ClusterReconciler) ensureAgent(ctx context.Context, cluster *v1alpha1.Cluster, serviceIP, token string) error {
-	config := agent.NewConfig(cluster, c.Client, c.Scheme)
-
-	var agentEnsurer agent.ResourceEnsurer
-	if cluster.Spec.Mode == agent.VirtualNodeMode {
-		agentEnsurer = agent.NewVirtualAgent(config, serviceIP, token)
-	} else {
-		agentEnsurer = agent.NewSharedAgent(config, serviceIP, c.SharedAgentImage, c.SharedAgentImagePullPolicy, token)
+	if err := c.Client.Create(ctx, agentsStatefulSet); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
 	}
 
-	return agentEnsurer.EnsureResources(ctx)
-}
-
-func (c *ClusterReconciler) validate(cluster *v1alpha1.Cluster) error {
-	if cluster.Name == ClusterInvalidName {
-		return errors.New("invalid cluster name " + cluster.Name + " no action will be taken")
-	}
 	return nil
 }
+
+func serverData(serviceIP string, cluster *v1alpha1.Cluster) string {
+	return "cluster-init: true\nserver: https://" + serviceIP + ":6443" + serverOptions(cluster)
+}
+
+func initConfigData(cluster *v1alpha1.Cluster) string {
+	return "cluster-init: true\n" + serverOptions(cluster)
+}
+
+func serverOptions(cluster *v1alpha1.Cluster) string {
+	var opts string
+
+	// TODO: generate token if not found
+	if cluster.Spec.Token != "" {
+		opts = "token: " + cluster.Spec.Token + "\n"
+	}
+	if cluster.Status.ClusterCIDR != "" {
+		opts = opts + "cluster-cidr: " + cluster.Status.ClusterCIDR + "\n"
+	}
+	if cluster.Status.ServiceCIDR != "" {
+		opts = opts + "service-cidr: " + cluster.Status.ServiceCIDR + "\n"
+	}
+	if cluster.Spec.ClusterDNS != "" {
+		opts = opts + "cluster-dns: " + cluster.Spec.ClusterDNS + "\n"
+	}
+	if len(cluster.Spec.TLSSANs) > 0 {
+		opts = opts + "tls-san:\n"
+		for _, addr := range cluster.Spec.TLSSANs {
+			opts = opts + "- " + addr + "\n"
+		}
+	}
+	// TODO: Add extra args to the options
+
+	return opts
+}
+
+func agentConfig(cluster *v1alpha1.Cluster, serviceIP string) v1.Secret {
+	config := agentData(serviceIP, cluster.Spec.Token)
+
+	return v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "k3k-agent-config",
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Data: map[string][]byte{
+			"config.yaml": []byte(config),
+		},
+	}
+}
+
+func agentData(serviceIP, token string) string {
+	return fmt.Sprintf(`server: https://%s:6443
+token: %s`, serviceIP, token)
+}

pkg/controller/cluster/cluster_finalize.go

@@ -1,79 +0,0 @@
-package cluster
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/cluster/agent"
-	v1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
-	"k8s.io/apimachinery/pkg/types"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-func (c *ClusterReconciler) finalizeCluster(ctx context.Context, cluster v1alpha1.Cluster) (reconcile.Result, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("finalizing Cluster")
-
-	// remove finalizer from the server pods and update them.
-	matchingLabels := ctrlruntimeclient.MatchingLabels(map[string]string{"role": "server"})
-	listOpts := &ctrlruntimeclient.ListOptions{Namespace: cluster.Namespace}
-	matchingLabels.ApplyToList(listOpts)
-
-	var podList v1.PodList
-	if err := c.Client.List(ctx, &podList, listOpts); err != nil {
-		return reconcile.Result{}, ctrlruntimeclient.IgnoreNotFound(err)
-	}
-
-	for _, pod := range podList.Items {
-		if controllerutil.ContainsFinalizer(&pod, etcdPodFinalizerName) {
-			controllerutil.RemoveFinalizer(&pod, etcdPodFinalizerName)
-			if err := c.Client.Update(ctx, &pod); err != nil {
-				return reconcile.Result{}, err
-			}
-		}
-	}
-
-	if err := c.unbindNodeProxyClusterRole(ctx, &cluster); err != nil {
-		return reconcile.Result{}, err
-	}
-
-	if controllerutil.ContainsFinalizer(&cluster, clusterFinalizerName) {
-		// remove finalizer from the cluster and update it.
-		controllerutil.RemoveFinalizer(&cluster, clusterFinalizerName)
-		if err := c.Client.Update(ctx, &cluster); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-	return reconcile.Result{}, nil
-}
-
-func (c *ClusterReconciler) unbindNodeProxyClusterRole(ctx context.Context, cluster *v1alpha1.Cluster) error {
-	clusterRoleBinding := &rbacv1.ClusterRoleBinding{}
-	if err := c.Client.Get(ctx, types.NamespacedName{Name: "k3k-node-proxy"}, clusterRoleBinding); err != nil {
-		return fmt.Errorf("failed to get or find k3k-node-proxy ClusterRoleBinding: %w", err)
-	}
-
-	subjectName := controller.SafeConcatNameWithPrefix(cluster.Name, agent.SharedNodeAgentName)
-
-	var cleanedSubjects []rbacv1.Subject
-	for _, subject := range clusterRoleBinding.Subjects {
-		if subject.Name != subjectName || subject.Namespace != cluster.Namespace {
-			cleanedSubjects = append(cleanedSubjects, subject)
-		}
-	}
-
-	// if no subject was removed, all good
-	if reflect.DeepEqual(clusterRoleBinding.Subjects, cleanedSubjects) {
-		return nil
-	}
-
-	clusterRoleBinding.Subjects = cleanedSubjects
-	return c.Client.Update(ctx, clusterRoleBinding)
-}

pkg/controller/cluster/cluster_suite_test.go

@@ -1,96 +0,0 @@
-package cluster_test
-
-import (
-	"context"
-	"path/filepath"
-	"testing"
-
-	"github.com/go-logr/zapr"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller/cluster"
-
-	"go.uber.org/zap"
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-func TestController(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Cluster Controller Suite")
-}
-
-var (
-	testEnv   *envtest.Environment
-	k8s       *kubernetes.Clientset
-	k8sClient client.Client
-	ctx       context.Context
-	cancel    context.CancelFunc
-)
-
-var _ = BeforeSuite(func() {
-
-	By("bootstrapping test environment")
-	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "charts", "k3k", "crds")},
-		ErrorIfCRDPathMissing: true,
-	}
-	cfg, err := testEnv.Start()
-	Expect(err).NotTo(HaveOccurred())
-
-	k8s, err = kubernetes.NewForConfig(cfg)
-	Expect(err).NotTo(HaveOccurred())
-
-	scheme := buildScheme()
-	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
-	Expect(err).NotTo(HaveOccurred())
-
-	ctrl.SetLogger(zapr.NewLogger(zap.NewNop()))
-
-	mgr, err := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme})
-	Expect(err).NotTo(HaveOccurred())
-
-	ctx, cancel = context.WithCancel(context.Background())
-	err = cluster.Add(ctx, mgr, "rancher/k3k-kubelet:latest", "")
-	Expect(err).NotTo(HaveOccurred())
-
-	go func() {
-		defer GinkgoRecover()
-		err = mgr.Start(ctx)
-		Expect(err).NotTo(HaveOccurred(), "failed to run manager")
-	}()
-})
-
-var _ = AfterSuite(func() {
-	cancel()
-
-	By("tearing down the test environment")
-	err := testEnv.Stop()
-	Expect(err).NotTo(HaveOccurred())
-})
-
-func buildScheme() *runtime.Scheme {
-	scheme := runtime.NewScheme()
-
-	err := corev1.AddToScheme(scheme)
-	Expect(err).NotTo(HaveOccurred())
-	err = rbacv1.AddToScheme(scheme)
-	Expect(err).NotTo(HaveOccurred())
-	err = appsv1.AddToScheme(scheme)
-	Expect(err).NotTo(HaveOccurred())
-	err = networkingv1.AddToScheme(scheme)
-	Expect(err).NotTo(HaveOccurred())
-	err = v1alpha1.AddToScheme(scheme)
-	Expect(err).NotTo(HaveOccurred())
-
-	return scheme
-}

pkg/controller/cluster/cluster_test.go

@@ -1,133 +0,0 @@
-package cluster_test
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller/cluster/server"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Cluster Controller", func() {
-
-	Context("creating a Cluster", func() {
-
-		var (
-			namespace string
-		)
-
-		BeforeEach(func() {
-			createdNS := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{GenerateName: "ns-"}}
-			err := k8sClient.Create(context.Background(), createdNS)
-			Expect(err).To(Not(HaveOccurred()))
-			namespace = createdNS.Name
-		})
-
-		When("creating a Cluster", func() {
-
-			var cluster *v1alpha1.Cluster
-
-			BeforeEach(func() {
-				cluster = &v1alpha1.Cluster{
-					ObjectMeta: metav1.ObjectMeta{
-						GenerateName: "cluster-",
-						Namespace:    namespace,
-					},
-				}
-
-				err := k8sClient.Create(ctx, cluster)
-				Expect(err).To(Not(HaveOccurred()))
-			})
-
-			It("will be created with some defaults", func() {
-				Expect(cluster.Spec.Mode).To(Equal(v1alpha1.SharedClusterMode))
-				Expect(cluster.Spec.Agents).To(Equal(ptr.To[int32](0)))
-				Expect(cluster.Spec.Servers).To(Equal(ptr.To[int32](1)))
-				Expect(cluster.Spec.Version).To(BeEmpty())
-				// TOFIX
-				//Expect(cluster.Spec.Persistence.Type).To(Equal(v1alpha1.DynamicNodesType))
-
-				serverVersion, err := k8s.DiscoveryClient.ServerVersion()
-				Expect(err).To(Not(HaveOccurred()))
-				expectedHostVersion := fmt.Sprintf("%s-k3s1", serverVersion.GitVersion)
-
-				Eventually(func() string {
-					err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster)
-					Expect(err).To(Not(HaveOccurred()))
-					return cluster.Status.HostVersion
-
-				}).
-					WithTimeout(time.Second * 30).
-					WithPolling(time.Second).
-					Should(Equal(expectedHostVersion))
-			})
-
-			When("exposing the cluster with nodePort and custom posrts", func() {
-				It("will have a NodePort service with the specified port exposed", func() {
-					cluster.Spec.Expose = &v1alpha1.ExposeConfig{
-						NodePort: &v1alpha1.NodePortConfig{
-							ServerPort:  ptr.To[int32](30010),
-							ServicePort: ptr.To[int32](30011),
-							ETCDPort:    ptr.To[int32](30012),
-						},
-					}
-
-					err := k8sClient.Update(ctx, cluster)
-					Expect(err).To(Not(HaveOccurred()))
-
-					var service v1.Service
-
-					Eventually(func() v1.ServiceType {
-						serviceKey := client.ObjectKey{
-							Name:      server.ServiceName(cluster.Name),
-							Namespace: cluster.Namespace,
-						}
-
-						err := k8sClient.Get(ctx, serviceKey, &service)
-						Expect(client.IgnoreNotFound(err)).To(Not(HaveOccurred()))
-						return service.Spec.Type
-					}).
-						WithTimeout(time.Second * 30).
-						WithPolling(time.Second).
-						Should(Equal(v1.ServiceTypeNodePort))
-
-					servicePorts := service.Spec.Ports
-					Expect(servicePorts).NotTo(BeEmpty())
-					Expect(servicePorts).To(HaveLen(3))
-
-					Expect(servicePorts).To(ContainElement(
-						And(
-							HaveField("Name", "k3s-server-port"),
-							HaveField("Port", BeEquivalentTo(6443)),
-							HaveField("NodePort", BeEquivalentTo(30010)),
-						),
-					))
-					Expect(servicePorts).To(ContainElement(
-						And(
-							HaveField("Name", "k3s-service-port"),
-							HaveField("Port", BeEquivalentTo(443)),
-							HaveField("NodePort", BeEquivalentTo(30011)),
-						),
-					))
-					Expect(servicePorts).To(ContainElement(
-						And(
-							HaveField("Name", "k3s-etcd-port"),
-							HaveField("Port", BeEquivalentTo(2379)),
-							HaveField("NodePort", BeEquivalentTo(30012)),
-						),
-					))
-				})
-			})
-		})
-	})
-})

pkg/controller/cluster/config/agent.go

@@ -0,0 +1,34 @@
+package config
+
+import (
+	"fmt"
+
+	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
+	"github.com/rancher/k3k/pkg/controller/util"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func Agent(cluster *v1alpha1.Cluster, serviceIP string) v1.Secret {
+	config := agentData(serviceIP, cluster.Spec.Token)
+
+	return v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "k3k-agent-config",
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Data: map[string][]byte{
+			"config.yaml": []byte(config),
+		},
+	}
+}
+
+func agentData(serviceIP, token string) string {
+	return fmt.Sprintf(`server: https://%s:6443
+token: %s
+with-node-id: true`, serviceIP, token)
+}

pkg/controller/cluster/config/server.go

@@ -0,0 +1,68 @@
+package config
+
+import (
+	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
+	"github.com/rancher/k3k/pkg/controller/util"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func Server(cluster *v1alpha1.Cluster, init bool, serviceIP string) (*v1.Secret, error) {
+	name := "k3k-server-config"
+	if init {
+		name = "k3k-init-server-config"
+	}
+
+	config := serverConfigData(serviceIP, cluster)
+	if init {
+		config = initConfigData(cluster)
+	}
+	return &v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Data: map[string][]byte{
+			"config.yaml": []byte(config),
+		},
+	}, nil
+}
+
+func serverConfigData(serviceIP string, cluster *v1alpha1.Cluster) string {
+	return "cluster-init: true\nserver: https://" + serviceIP + ":6443\n" + serverOptions(cluster)
+}
+
+func initConfigData(cluster *v1alpha1.Cluster) string {
+	return "cluster-init: true\n" + serverOptions(cluster)
+}
+
+func serverOptions(cluster *v1alpha1.Cluster) string {
+	var opts string
+
+	// TODO: generate token if not found
+	if cluster.Spec.Token != "" {
+		opts = "token: " + cluster.Spec.Token + "\n"
+	}
+	if cluster.Status.ClusterCIDR != "" {
+		opts = opts + "cluster-cidr: " + cluster.Status.ClusterCIDR + "\n"
+	}
+	if cluster.Status.ServiceCIDR != "" {
+		opts = opts + "service-cidr: " + cluster.Status.ServiceCIDR + "\n"
+	}
+	if cluster.Spec.ClusterDNS != "" {
+		opts = opts + "cluster-dns: " + cluster.Spec.ClusterDNS + "\n"
+	}
+	if len(cluster.Spec.TLSSANs) > 0 {
+		opts = opts + "tls-san:\n"
+		for _, addr := range cluster.Spec.TLSSANs {
+			opts = opts + "- " + addr + "\n"
+		}
+	}
+	// TODO: Add extra args to the options
+
+	return opts
+}

pkg/controller/cluster/pod.go

@@ -1,254 +0,0 @@
-package cluster
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"net/url"
-	"strings"
-
-	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	k3kcontroller "github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/certs"
-	"github.com/rancher/k3k/pkg/controller/cluster/server"
-	"github.com/rancher/k3k/pkg/controller/cluster/server/bootstrap"
-	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	apps "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/util/retry"
-	ctrl "sigs.k8s.io/controller-runtime"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-const (
-	podController = "k3k-pod-controller"
-)
-
-type PodReconciler struct {
-	Client ctrlruntimeclient.Client
-	Scheme *runtime.Scheme
-}
-
-// Add adds a new controller to the manager
-func AddPodController(ctx context.Context, mgr manager.Manager) error {
-	// initialize a new Reconciler
-	reconciler := PodReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}
-
-	return ctrl.NewControllerManagedBy(mgr).
-		Watches(&v1.Pod{}, handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &apps.StatefulSet{}, handler.OnlyControllerOwner())).
-		Named(podController).
-		WithOptions(controller.Options{
-			MaxConcurrentReconciles: maxConcurrentReconciles,
-		}).
-		Complete(&reconciler)
-}
-
-func (p *PodReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-	log := ctrl.LoggerFrom(ctx).WithValues("statefulset", req.NamespacedName)
-	ctx = ctrl.LoggerInto(ctx, log) // enrich the current logger
-
-	s := strings.Split(req.Name, "-")
-	if len(s) < 1 {
-		return reconcile.Result{}, nil
-	}
-	if s[0] != "k3k" {
-		return reconcile.Result{}, nil
-	}
-	clusterName := s[1]
-	var cluster v1alpha1.Cluster
-	if err := p.Client.Get(ctx, types.NamespacedName{Name: clusterName, Namespace: req.Namespace}, &cluster); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return reconcile.Result{}, err
-		}
-	}
-	matchingLabels := ctrlruntimeclient.MatchingLabels(map[string]string{"role": "server"})
-	listOpts := &ctrlruntimeclient.ListOptions{Namespace: req.Namespace}
-	matchingLabels.ApplyToList(listOpts)
-
-	var podList v1.PodList
-	if err := p.Client.List(ctx, &podList, listOpts); err != nil {
-		return reconcile.Result{}, ctrlruntimeclient.IgnoreNotFound(err)
-	}
-	if len(podList.Items) == 1 {
-		return reconcile.Result{}, nil
-	}
-	for _, pod := range podList.Items {
-		if err := p.handleServerPod(ctx, cluster, &pod); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-	return reconcile.Result{}, nil
-}
-
-func (p *PodReconciler) handleServerPod(ctx context.Context, cluster v1alpha1.Cluster, pod *v1.Pod) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("handling server pod")
-
-	role, found := pod.Labels["role"]
-	if !found {
-		return fmt.Errorf("server pod has no role label")
-	}
-
-	if role != "server" {
-		log.V(1).Info("pod has a different role: " + role)
-		return nil
-	}
-
-	// if etcd pod is marked for deletion then we need to remove it from the etcd member list before deletion
-	if !pod.DeletionTimestamp.IsZero() {
-		// check if cluster is deleted then remove the finalizer from the pod
-		if cluster.Name == "" {
-			if controllerutil.ContainsFinalizer(pod, etcdPodFinalizerName) {
-				controllerutil.RemoveFinalizer(pod, etcdPodFinalizerName)
-				if err := p.Client.Update(ctx, pod); err != nil {
-					return err
-				}
-			}
-			return nil
-		}
-		tlsConfig, err := p.getETCDTLS(ctx, &cluster)
-		if err != nil {
-			return err
-		}
-		// remove server from etcd
-		client, err := clientv3.New(clientv3.Config{
-			Endpoints: []string{
-				fmt.Sprintf("https://%s.%s:2379", server.ServiceName(cluster.Name), pod.Namespace),
-			},
-			TLS: tlsConfig,
-		})
-		if err != nil {
-			return err
-		}
-
-		if err := removePeer(ctx, client, pod.Name, pod.Status.PodIP); err != nil {
-			return err
-		}
-
-		// remove our finalizer from the list and update it.
-		if controllerutil.ContainsFinalizer(pod, etcdPodFinalizerName) {
-			controllerutil.RemoveFinalizer(pod, etcdPodFinalizerName)
-			if err := p.Client.Update(ctx, pod); err != nil {
-				return err
-			}
-		}
-	}
-	if !controllerutil.ContainsFinalizer(pod, etcdPodFinalizerName) {
-		controllerutil.AddFinalizer(pod, etcdPodFinalizerName)
-		return p.Client.Update(ctx, pod)
-	}
-
-	return nil
-}
-
-func (p *PodReconciler) getETCDTLS(ctx context.Context, cluster *v1alpha1.Cluster) (*tls.Config, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("generating etcd TLS client certificate", "cluster", cluster)
-
-	token, err := p.clusterToken(ctx, cluster)
-	if err != nil {
-		return nil, err
-	}
-	endpoint := server.ServiceName(cluster.Name) + "." + cluster.Namespace
-
-	var b *bootstrap.ControlRuntimeBootstrap
-	if err := retry.OnError(k3kcontroller.Backoff, func(err error) bool {
-		return true
-	}, func() error {
-		var err error
-		b, err = bootstrap.DecodedBootstrap(token, endpoint)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	etcdCert, etcdKey, err := certs.CreateClientCertKey("etcd-client", nil, nil, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}, 0, b.ETCDServerCA.Content, b.ETCDServerCAKey.Content)
-	if err != nil {
-		return nil, err
-	}
-	clientCert, err := tls.X509KeyPair(etcdCert, etcdKey)
-	if err != nil {
-		return nil, err
-	}
-	// create rootCA CertPool
-	cert, err := certutil.ParseCertsPEM([]byte(b.ETCDServerCA.Content))
-	if err != nil {
-		return nil, err
-	}
-	pool := x509.NewCertPool()
-	pool.AddCert(cert[0])
-
-	return &tls.Config{
-		RootCAs:      pool,
-		Certificates: []tls.Certificate{clientCert},
-	}, nil
-}
-
-// removePeer removes a peer from the cluster. The peer name and IP address must both match.
-func removePeer(ctx context.Context, client *clientv3.Client, name, address string) error {
-	log := ctrl.LoggerFrom(ctx)
-	log.Info("removing peer from cluster", "name", name, "address", address)
-
-	ctx, cancel := context.WithTimeout(ctx, memberRemovalTimeout)
-	defer cancel()
-	members, err := client.MemberList(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, member := range members.Members {
-		if !strings.Contains(member.Name, name) {
-			continue
-		}
-		for _, peerURL := range member.PeerURLs {
-			u, err := url.Parse(peerURL)
-			if err != nil {
-				return err
-			}
-
-			if u.Hostname() == address {
-				log.Info("removing member from etcd", "name", member.Name, "id", member.ID, "address", address)
-				_, err := client.MemberRemove(ctx, member.ID)
-				if errors.Is(err, rpctypes.ErrGRPCMemberNotFound) {
-					return nil
-				}
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (p *PodReconciler) clusterToken(ctx context.Context, cluster *v1alpha1.Cluster) (string, error) {
-	var tokenSecret v1.Secret
-	nn := types.NamespacedName{
-		Name:      TokenSecretName(cluster.Name),
-		Namespace: cluster.Namespace,
-	}
-	if cluster.Spec.TokenSecretRef != nil {
-		nn.Name = TokenSecretName(cluster.Name)
-	}
-	if err := p.Client.Get(ctx, nn, &tokenSecret); err != nil {
-		return "", err
-	}
-	if _, ok := tokenSecret.Data["token"]; !ok {
-		return "", fmt.Errorf("no token field in secret %s/%s", nn.Namespace, nn.Name)
-	}
-	return string(tokenSecret.Data["token"]), nil
-}

pkg/controller/cluster/server/bootstrap/bootstrap.go

@@ -1,166 +0,0 @@
-package bootstrap
-
-import (
-	"context"
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-type ControlRuntimeBootstrap struct {
-	ServerCA        content `json:"serverCA"`
-	ServerCAKey     content `json:"serverCAKey"`
-	ClientCA        content `json:"clientCA"`
-	ClientCAKey     content `json:"clientCAKey"`
-	ETCDServerCA    content `json:"etcdServerCA"`
-	ETCDServerCAKey content `json:"etcdServerCAKey"`
-}
-
-type content struct {
-	Timestamp string
-	Content   string
-}
-
-// Generate generates the bootstrap for the cluster:
-// 1- use the server token to get the bootstrap data from k3s
-// 2- save the bootstrap data as a secret
-func GenerateBootstrapData(ctx context.Context, cluster *v1alpha1.Cluster, ip, token string) ([]byte, error) {
-	bootstrap, err := requestBootstrap(token, ip)
-	if err != nil {
-		return nil, fmt.Errorf("failed to request bootstrap secret: %w", err)
-	}
-
-	if err := decodeBootstrap(bootstrap); err != nil {
-		return nil, fmt.Errorf("failed to decode bootstrap secret: %w", err)
-	}
-
-	return json.Marshal(bootstrap)
-
-}
-
-func requestBootstrap(token, serverIP string) (*ControlRuntimeBootstrap, error) {
-	url := "https://" + serverIP + ":6443/v1-k3s/server-bootstrap"
-
-	client := http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		},
-		Timeout: 5 * time.Second,
-	}
-
-	req, err := http.NewRequest(http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Add("Authorization", "Basic "+basicAuth("server", token))
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var runtimeBootstrap ControlRuntimeBootstrap
-	if err := json.NewDecoder(resp.Body).Decode(&runtimeBootstrap); err != nil {
-		return nil, err
-	}
-
-	return &runtimeBootstrap, nil
-}
-
-func basicAuth(username, password string) string {
-	auth := username + ":" + password
-	return base64.StdEncoding.EncodeToString([]byte(auth))
-}
-
-func decodeBootstrap(bootstrap *ControlRuntimeBootstrap) error {
-	//client-ca
-	decoded, err := base64.StdEncoding.DecodeString(bootstrap.ClientCA.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ClientCA.Content = string(decoded)
-
-	//client-ca-key
-	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ClientCAKey.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ClientCAKey.Content = string(decoded)
-
-	//server-ca
-	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ServerCA.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ServerCA.Content = string(decoded)
-
-	//server-ca-key
-	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ServerCAKey.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ServerCAKey.Content = string(decoded)
-
-	//etcd-ca
-	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ETCDServerCA.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ETCDServerCA.Content = string(decoded)
-
-	//etcd-ca-key
-	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ETCDServerCAKey.Content)
-	if err != nil {
-		return err
-	}
-	bootstrap.ETCDServerCAKey.Content = string(decoded)
-
-	return nil
-}
-
-func DecodedBootstrap(token, ip string) (*ControlRuntimeBootstrap, error) {
-	bootstrap, err := requestBootstrap(token, ip)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := decodeBootstrap(bootstrap); err != nil {
-		return nil, err
-	}
-
-	return bootstrap, nil
-}
-
-func GetFromSecret(ctx context.Context, client client.Client, cluster *v1alpha1.Cluster) (*ControlRuntimeBootstrap, error) {
-	key := types.NamespacedName{
-		Name:      controller.SafeConcatNameWithPrefix(cluster.Name, "bootstrap"),
-		Namespace: cluster.Namespace,
-	}
-
-	var bootstrapSecret v1.Secret
-	if err := client.Get(ctx, key, &bootstrapSecret); err != nil {
-		return nil, err
-	}
-
-	bootstrapData := bootstrapSecret.Data["bootstrap"]
-	if bootstrapData == nil {
-		return nil, errors.New("empty bootstrap")
-	}
-
-	var bootstrap ControlRuntimeBootstrap
-	err := json.Unmarshal(bootstrapData, &bootstrap)
-	return &bootstrap, err
-}

pkg/controller/cluster/server/config.go

@@ -1,83 +0,0 @@
-package server
-
-import (
-	"fmt"
-
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/cluster/agent"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func (s *Server) Config(init bool, serviceIP string) (*v1.Secret, error) {
-	name := configSecretName(s.cluster.Name, init)
-	s.cluster.Status.TLSSANs = append(s.cluster.Spec.TLSSANs,
-		serviceIP,
-		ServiceName(s.cluster.Name),
-		fmt.Sprintf("%s.%s", ServiceName(s.cluster.Name), s.cluster.Namespace),
-	)
-
-	config := serverConfigData(serviceIP, s.cluster, s.token)
-	if init {
-		config = initConfigData(s.cluster, s.token)
-	}
-	return &v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: s.cluster.Namespace,
-		},
-		Data: map[string][]byte{
-			"config.yaml": []byte(config),
-		},
-	}, nil
-}
-
-func serverConfigData(serviceIP string, cluster *v1alpha1.Cluster, token string) string {
-	return "cluster-init: true\nserver: https://" + serviceIP + ":6443\n" + serverOptions(cluster, token)
-}
-
-func initConfigData(cluster *v1alpha1.Cluster, token string) string {
-	return "cluster-init: true\n" + serverOptions(cluster, token)
-}
-
-func serverOptions(cluster *v1alpha1.Cluster, token string) string {
-	var opts string
-
-	// TODO: generate token if not found
-	if token != "" {
-		opts = "token: " + token + "\n"
-	}
-	if cluster.Status.ClusterCIDR != "" {
-		opts = opts + "cluster-cidr: " + cluster.Status.ClusterCIDR + "\n"
-	}
-	if cluster.Status.ServiceCIDR != "" {
-		opts = opts + "service-cidr: " + cluster.Status.ServiceCIDR + "\n"
-	}
-	if cluster.Spec.ClusterDNS != "" {
-		opts = opts + "cluster-dns: " + cluster.Spec.ClusterDNS + "\n"
-	}
-	if len(cluster.Status.TLSSANs) > 0 {
-		opts = opts + "tls-san:\n"
-		for _, addr := range cluster.Status.TLSSANs {
-			opts = opts + "- " + addr + "\n"
-		}
-	}
-	if cluster.Spec.Mode != agent.VirtualNodeMode {
-		opts = opts + "disable-agent: true\negress-selector-mode: disabled\ndisable:\n- servicelb\n- traefik\n- metrics-server\n- local-storage"
-	}
-	// TODO: Add extra args to the options
-
-	return opts
-}
-
-func configSecretName(clusterName string, init bool) string {
-	if !init {
-		return controller.SafeConcatNameWithPrefix(clusterName, configName)
-	}
-	return controller.SafeConcatNameWithPrefix(clusterName, initConfigName)
-}

pkg/controller/cluster/server/ingress.go

@@ -3,84 +3,89 @@ package server
 import (
 	"context"
 
-	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
+	"github.com/rancher/k3k/pkg/controller/util"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
-	servicePort = 443
-	serverPort  = 6443
-	etcdPort    = 2379
+	wildcardDNS = ".sslip.io"
+
+	nginxSSLPassthroughAnnotation  = "nginx.ingress.kubernetes.io/ssl-passthrough"
+	nginxBackendProtocolAnnotation = "nginx.ingress.kubernetes.io/backend-protocol"
+	nginxSSLRedirectAnnotation     = "nginx.ingress.kubernetes.io/ssl-redirect"
 )
 
-func IngressName(clusterName string) string {
-	return controller.SafeConcatNameWithPrefix(clusterName, "ingress")
-}
+func (s *Server) Ingress(ctx context.Context, client client.Client) (*networkingv1.Ingress, error) {
+	addresses, err := util.Addresses(ctx, client)
+	if err != nil {
+		return nil, err
+	}
 
-func Ingress(ctx context.Context, cluster *v1alpha1.Cluster) networkingv1.Ingress {
-	ingress := networkingv1.Ingress{
+	ingressRules := s.ingressRules(addresses)
+	ingress := &networkingv1.Ingress{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Ingress",
 			APIVersion: "networking.k8s.io/v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      IngressName(cluster.Name),
-			Namespace: cluster.Namespace,
+			Name:      s.cluster.Name + "-server-ingress",
+			Namespace: util.ClusterNamespace(s.cluster),
 		},
 		Spec: networkingv1.IngressSpec{
-			Rules: ingressRules(cluster),
+			IngressClassName: &s.cluster.Spec.Expose.Ingress.IngressClassName,
+			Rules:            ingressRules,
 		},
 	}
 
-	if cluster.Spec.Expose != nil && cluster.Spec.Expose.Ingress != nil {
-		ingressConfig := cluster.Spec.Expose.Ingress
+	configureIngressOptions(ingress, s.cluster.Spec.Expose.Ingress.IngressClassName)
 
-		if ingressConfig.IngressClassName != "" {
-			ingress.Spec.IngressClassName = ptr.To(ingressConfig.IngressClassName)
-		}
-
-		if ingressConfig.Annotations != nil {
-			ingress.Annotations = ingressConfig.Annotations
-		}
-	}
-
-	return ingress
+	return ingress, nil
 }
 
-func ingressRules(cluster *v1alpha1.Cluster) []networkingv1.IngressRule {
+func (s *Server) ingressRules(addresses []string) []networkingv1.IngressRule {
 	var ingressRules []networkingv1.IngressRule
+	pathTypePrefix := networkingv1.PathTypePrefix
 
-	if cluster.Spec.Expose == nil || cluster.Spec.Expose.Ingress == nil {
-		return ingressRules
-	}
-
-	path := networkingv1.HTTPIngressPath{
-		Path:     "/",
-		PathType: ptr.To(networkingv1.PathTypePrefix),
-		Backend: networkingv1.IngressBackend{
-			Service: &networkingv1.IngressServiceBackend{
-				Name: ServiceName(cluster.Name),
-				Port: networkingv1.ServiceBackendPort{
-					Number: serverPort,
-				},
-			},
-		},
-	}
-
-	hosts := cluster.Spec.TLSSANs
-	for _, host := range hosts {
-		ingressRules = append(ingressRules, networkingv1.IngressRule{
-			Host: host,
+	for _, address := range addresses {
+		rule := networkingv1.IngressRule{
+			Host: s.cluster.Name + "." + address + wildcardDNS,
 			IngressRuleValue: networkingv1.IngressRuleValue{
 				HTTP: &networkingv1.HTTPIngressRuleValue{
-					Paths: []networkingv1.HTTPIngressPath{path},
+					Paths: []networkingv1.HTTPIngressPath{
+						{
+							Path:     "/",
+							PathType: &pathTypePrefix,
+							Backend: networkingv1.IngressBackend{
+								Service: &networkingv1.IngressServiceBackend{
+									Name: "k3k-server-service",
+									Port: networkingv1.ServiceBackendPort{
+										Number: port,
+									},
+								},
+							},
+						},
+					},
 				},
 			},
-		})
+		}
+		ingressRules = append(ingressRules, rule)
 	}
 
 	return ingressRules
 }
+
+// configureIngressOptions will configure the ingress object by
+// adding tls passthrough capabilities and TLS needed annotations
+// it depends on the ingressclassname to configure each ingress
+// TODO: add treafik support through ingresstcproutes
+func configureIngressOptions(ingress *networkingv1.Ingress, ingressClassName string) {
+	// initial support for nginx ingress via annotations
+	if ingressClassName == "nginx" {
+		ingress.Annotations = make(map[string]string)
+		ingress.Annotations[nginxSSLPassthroughAnnotation] = "true"
+		ingress.Annotations[nginxSSLRedirectAnnotation] = "true"
+		ingress.Annotations[nginxBackendProtocolAnnotation] = "HTTPS"
+	}
+}

pkg/controller/cluster/server/kubeconfig.go

@@ -0,0 +1,236 @@
+package server
+
+import (
+	"context"
+	"crypto"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	certutil "github.com/rancher/dynamiclistener/cert"
+	"github.com/rancher/k3k/pkg/controller/util"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/client-go/util/retry"
+)
+
+const (
+	adminCommonName = "system:admin"
+	port            = 6443
+)
+
+type controlRuntimeBootstrap struct {
+	ServerCA    content
+	ServerCAKey content
+	ClientCA    content
+	ClientCAKey content
+}
+
+type content struct {
+	Timestamp string
+	Content   string
+}
+
+// GenerateNewKubeConfig generates the kubeconfig for the cluster:
+// 1- use the server token to get the bootstrap data from k3s
+// 2- generate client admin cert/key
+// 3- use the ca cert from the bootstrap data & admin cert/key to write a new kubeconfig
+// 4- save the new kubeconfig as a secret
+func (s *Server) GenerateNewKubeConfig(ctx context.Context, ip string) (*v1.Secret, error) {
+	token := s.cluster.Spec.Token
+
+	var bootstrap *controlRuntimeBootstrap
+	if err := retry.OnError(retry.DefaultBackoff, func(err error) bool {
+		return true
+	}, func() error {
+		var err error
+		bootstrap, err = requestBootstrap(token, ip)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	if err := decodeBootstrap(bootstrap); err != nil {
+		return nil, err
+	}
+
+	adminCert, adminKey, err := createClientCertKey(
+		adminCommonName, []string{user.SystemPrivilegedGroup},
+		nil, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
+		bootstrap.ClientCA.Content,
+		bootstrap.ClientCAKey.Content)
+	if err != nil {
+		return nil, err
+	}
+
+	url := fmt.Sprintf("https://%s:%d", ip, port)
+	kubeconfigData, err := kubeconfig(url, []byte(bootstrap.ServerCA.Content), adminCert, adminKey)
+	if err != nil {
+		return nil, err
+	}
+
+	return &v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      s.cluster.Name + "-kubeconfig",
+			Namespace: util.ClusterNamespace(s.cluster),
+		},
+		Data: map[string][]byte{
+			"kubeconfig.yaml": kubeconfigData,
+		},
+	}, nil
+
+}
+
+func requestBootstrap(token, serverIP string) (*controlRuntimeBootstrap, error) {
+	url := "https://" + serverIP + ":6443/v1-k3s/server-bootstrap"
+
+	client := http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		},
+		Timeout: 5 * time.Second,
+	}
+
+	req, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", "Basic "+basicAuth("server", token))
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var runtimeBootstrap controlRuntimeBootstrap
+	if err := json.NewDecoder(resp.Body).Decode(&runtimeBootstrap); err != nil {
+		return nil, err
+	}
+
+	return &runtimeBootstrap, nil
+}
+
+func createClientCertKey(commonName string, organization []string, altNames *certutil.AltNames, extKeyUsage []x509.ExtKeyUsage, caCert, caKey string) ([]byte, []byte, error) {
+	caKeyPEM, err := certutil.ParsePrivateKeyPEM([]byte(caKey))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	caCertPEM, err := certutil.ParseCertsPEM([]byte(caCert))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	b, err := generateKey()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	key, err := certutil.ParsePrivateKeyPEM(b)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	cfg := certutil.Config{
+		CommonName:   commonName,
+		Organization: organization,
+		Usages:       extKeyUsage,
+	}
+	if altNames != nil {
+		cfg.AltNames = *altNames
+	}
+	cert, err := certutil.NewSignedCert(cfg, key.(crypto.Signer), caCertPEM[0], caKeyPEM.(crypto.Signer))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return append(certutil.EncodeCertPEM(cert), certutil.EncodeCertPEM(caCertPEM[0])...), b, nil
+}
+
+func generateKey() (data []byte, err error) {
+	generatedData, err := certutil.MakeEllipticPrivateKeyPEM()
+	if err != nil {
+		return nil, fmt.Errorf("error generating key: %v", err)
+	}
+
+	return generatedData, nil
+}
+
+func kubeconfig(url string, serverCA, clientCert, clientKey []byte) ([]byte, error) {
+	config := clientcmdapi.NewConfig()
+
+	cluster := clientcmdapi.NewCluster()
+	cluster.CertificateAuthorityData = serverCA
+	cluster.Server = url
+
+	authInfo := clientcmdapi.NewAuthInfo()
+	authInfo.ClientCertificateData = clientCert
+	authInfo.ClientKeyData = clientKey
+
+	context := clientcmdapi.NewContext()
+	context.AuthInfo = "default"
+	context.Cluster = "default"
+
+	config.Clusters["default"] = cluster
+	config.AuthInfos["default"] = authInfo
+	config.Contexts["default"] = context
+	config.CurrentContext = "default"
+
+	kubeconfig, err := clientcmd.Write(*config)
+	if err != nil {
+		return nil, err
+	}
+
+	return kubeconfig, nil
+}
+
+func basicAuth(username, password string) string {
+	auth := username + ":" + password
+	return base64.StdEncoding.EncodeToString([]byte(auth))
+}
+
+func decodeBootstrap(bootstrap *controlRuntimeBootstrap) error {
+	//client-ca
+	decoded, err := base64.StdEncoding.DecodeString(bootstrap.ClientCA.Content)
+	if err != nil {
+		return err
+	}
+	bootstrap.ClientCA.Content = string(decoded)
+
+	//client-ca-key
+	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ClientCAKey.Content)
+	if err != nil {
+		return err
+	}
+	bootstrap.ClientCAKey.Content = string(decoded)
+
+	//server-ca
+	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ServerCA.Content)
+	if err != nil {
+		return err
+	}
+	bootstrap.ServerCA.Content = string(decoded)
+
+	//server-ca-key
+	decoded, err = base64.StdEncoding.DecodeString(bootstrap.ServerCAKey.Content)
+	if err != nil {
+		return err
+	}
+	bootstrap.ServerCAKey.Content = string(decoded)
+
+	return nil
+}

pkg/controller/cluster/server/server.go

@@ -1,78 +1,161 @@
 package server
 
 import (
-	"bytes"
 	"context"
-	"strings"
-	"text/template"
+	"fmt"
+	"strconv"
 
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
-	"github.com/rancher/k3k/pkg/controller/cluster/agent"
+	"github.com/rancher/k3k/pkg/controller/util"
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/ptr"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
-	k3kSystemNamespace = "k3k-system"
-	serverName         = "server"
-	configName         = "server-config"
-	initConfigName     = "init-server-config"
-
-	ServerPort = 6443
+	serverName         = "k3k-"
+	k3kSystemNamespace = serverName + "system"
+	initServerName     = serverName + "init-server"
 )
 
 // Server
 type Server struct {
 	cluster *v1alpha1.Cluster
 	client  client.Client
-	mode    string
-	token   string
 }
 
-func New(cluster *v1alpha1.Cluster, client client.Client, token, mode string) *Server {
+func New(cluster *v1alpha1.Cluster, client client.Client) *Server {
 	return &Server{
 		cluster: cluster,
 		client:  client,
-		token:   token,
-		mode:    mode,
 	}
 }
 
-func (s *Server) podSpec(image, name string, persistent bool, startupCmd string) v1.PodSpec {
-	var limit v1.ResourceList
-	if s.cluster.Spec.Limit != nil && s.cluster.Spec.Limit.ServerLimit != nil {
-		limit = s.cluster.Spec.Limit.ServerLimit
+func (s *Server) Deploy(ctx context.Context, init bool) (*apps.Deployment, error) {
+	var replicas int32
+	image := util.K3SImage(s.cluster)
+
+	name := serverName + "server"
+	if init {
+		name = serverName + "init-server"
 	}
-	podSpec := v1.PodSpec{
-		NodeSelector:      s.cluster.Spec.NodeSelector,
-		PriorityClassName: s.cluster.Spec.PriorityClass,
-		Volumes: []v1.Volume{
-			{
-				Name: "initconfig",
-				VolumeSource: v1.VolumeSource{
-					Secret: &v1.SecretVolumeSource{
-						SecretName: configSecretName(s.cluster.Name, true),
-						Items: []v1.KeyToPath{
-							{
-								Key:  "config.yaml",
-								Path: "config.yaml",
-							},
-						},
-					},
+
+	replicas = *s.cluster.Spec.Servers - 1
+	if init {
+		replicas = 1
+	}
+
+	var volumes []v1.Volume
+	var volumeMounts []v1.VolumeMount
+
+	for _, addon := range s.cluster.Spec.Addons {
+		namespace := k3kSystemNamespace
+		if addon.SecretNamespace != "" {
+			namespace = addon.SecretNamespace
+		}
+
+		nn := types.NamespacedName{
+			Name:      addon.SecretRef,
+			Namespace: namespace,
+		}
+
+		var addons v1.Secret
+		if err := s.client.Get(ctx, nn, &addons); err != nil {
+			return nil, err
+		}
+
+		clusterAddons := v1.Secret{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "Secret",
+				APIVersion: "v1",
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      addons.Name,
+				Namespace: util.ClusterNamespace(s.cluster),
+			},
+			Data: make(map[string][]byte, len(addons.Data)),
+		}
+		for k, v := range addons.Data {
+			clusterAddons.Data[k] = v
+		}
+
+		if err := s.client.Create(ctx, &clusterAddons); err != nil {
+			return nil, err
+		}
+
+		name := "varlibrancherk3smanifests" + addon.SecretRef
+		volume := v1.Volume{
+			Name: name,
+			VolumeSource: v1.VolumeSource{
+				Secret: &v1.SecretVolumeSource{
+					SecretName: addon.SecretRef,
 				},
 			},
+		}
+		volumes = append(volumes, volume)
+
+		volumeMount := v1.VolumeMount{
+			Name:      name,
+			MountPath: "/var/lib/rancher/k3s/server/manifests/" + addon.SecretRef,
+			// changes to this part of the filesystem shouldn't be done manually. The secret should be updated instead.
+			ReadOnly: true,
+		}
+		volumeMounts = append(volumeMounts, volumeMount)
+	}
+
+	podSpec := s.podSpec(ctx, image, name, false)
+
+	podSpec.Volumes = append(podSpec.Volumes, volumes...)
+	podSpec.Containers[0].VolumeMounts = append(podSpec.Containers[0].VolumeMounts, volumeMounts...)
+
+	fmt.Printf("XXX - Pod Spec\n %#v\n", podSpec)
+
+	return &apps.Deployment{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Deployment",
+			APIVersion: "apps/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      s.cluster.Name + "-" + name,
+			Namespace: util.ClusterNamespace(s.cluster),
+		},
+		Spec: apps.DeploymentSpec{
+			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"cluster": s.cluster.Name,
+					"role":    "server",
+					"init":    strconv.FormatBool(init),
+				},
+			},
+			Template: v1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"cluster": s.cluster.Name,
+						"role":    "server",
+						"init":    strconv.FormatBool(init),
+					},
+				},
+				Spec: podSpec,
+			},
+		},
+	}, nil
+}
+
+func (s *Server) podSpec(ctx context.Context, image, name string, statefulSet bool) v1.PodSpec {
+	args := append([]string{"server", "--config", "/opt/rancher/k3s/config.yaml"}, s.cluster.Spec.ServerArgs...)
+
+	podSpec := v1.PodSpec{
+		Volumes: []v1.Volume{
 			{
 				Name: "config",
 				VolumeSource: v1.VolumeSource{
 					Secret: &v1.SecretVolumeSource{
-						SecretName: configSecretName(s.cluster.Name, false),
+						SecretName: name + "-config",
 						Items: []v1.KeyToPath{
 							{
 								Key:  "config.yaml",
@@ -106,47 +189,22 @@ func (s *Server) podSpec(image, name string, persistent bool, startupCmd string)
 					EmptyDir: &v1.EmptyDirVolumeSource{},
 				},
 			},
-			{
-				Name: "varlibkubelet",
-				VolumeSource: v1.VolumeSource{
-					EmptyDir: &v1.EmptyDirVolumeSource{},
-				},
-			},
 		},
 		Containers: []v1.Container{
 			{
 				Name:  name,
 				Image: image,
-				Resources: v1.ResourceRequirements{
-					Limits: limit,
+				SecurityContext: &v1.SecurityContext{
+					Privileged: pointer.Bool(true),
 				},
-				Env: []v1.EnvVar{
-					{
-						Name: "POD_NAME",
-						ValueFrom: &v1.EnvVarSource{
-							FieldRef: &v1.ObjectFieldSelector{
-								FieldPath: "metadata.name",
-							},
-						},
-					},
-					{
-						Name: "POD_IP",
-						ValueFrom: &v1.EnvVarSource{
-							FieldRef: &v1.ObjectFieldSelector{
-								FieldPath: "status.podIP",
-							},
-						},
-					},
+				Command: []string{
+					"/bin/k3s",
 				},
+				Args: args,
 				VolumeMounts: []v1.VolumeMount{
 					{
 						Name:      "config",
-						MountPath: "/opt/rancher/k3s/server",
-						ReadOnly:  false,
-					},
-					{
-						Name:      "initconfig",
-						MountPath: "/opt/rancher/k3s/init",
+						MountPath: "/opt/rancher/k3s/",
 						ReadOnly:  false,
 					},
 					{
@@ -184,15 +242,15 @@ func (s *Server) podSpec(image, name string, persistent bool, startupCmd string)
 		},
 	}
 
-	cmd := []string{
-		"/bin/sh",
-		"-c",
-		startupCmd,
-	}
-
-	podSpec.Containers[0].Command = cmd
-	if !persistent {
+	if !statefulSet {
 		podSpec.Volumes = append(podSpec.Volumes, v1.Volume{
+
+			Name: "varlibkubelet",
+			VolumeSource: v1.VolumeSource{
+				EmptyDir: &v1.EmptyDirVolumeSource{},
+			},
+		}, v1.Volume{
+
 			Name: "varlibrancherk3s",
 			VolumeSource: v1.VolumeSource{
 				EmptyDir: &v1.EmptyDirVolumeSource{},
@@ -200,186 +258,92 @@ func (s *Server) podSpec(image, name string, persistent bool, startupCmd string)
 		},
 		)
 	}
-
-	// Adding readiness probes to statefulset
-	podSpec.Containers[0].ReadinessProbe = &v1.Probe{
-		InitialDelaySeconds: 60,
-		FailureThreshold:    5,
-		TimeoutSeconds:      10,
-		ProbeHandler: v1.ProbeHandler{
-			TCPSocket: &v1.TCPSocketAction{
-				Port: intstr.FromInt(6443),
-			},
-		},
-	}
-	// start the pod unprivileged in shared mode
-	if s.mode == agent.VirtualNodeMode {
-		podSpec.Containers[0].SecurityContext = &v1.SecurityContext{
-			Privileged: ptr.To(true),
-		}
-	}
 	return podSpec
 }
 
-func (s *Server) StatefulServer(ctx context.Context) (*apps.StatefulSet, error) {
-	var (
-		replicas   int32
-		pvClaim    v1.PersistentVolumeClaim
-		err        error
-		persistent bool
-	)
-	image := controller.K3SImage(s.cluster)
-	name := controller.SafeConcatNameWithPrefix(s.cluster.Name, serverName)
+func (s *Server) StatefulServer(ctx context.Context, cluster *v1alpha1.Cluster, init bool) *apps.StatefulSet {
+	var replicas int32
+	image := util.K3SImage(cluster)
 
-	replicas = *s.cluster.Spec.Servers
-
-	if s.cluster.Spec.Persistence.Type == v1alpha1.DynamicNodesType {
-		persistent = true
-		pvClaim = s.setupDynamicPersistence()
+	name := serverName
+	if init {
+		name = initServerName
 	}
 
-	var volumes []v1.Volume
-	var volumeMounts []v1.VolumeMount
-	for _, addon := range s.cluster.Spec.Addons {
-		namespace := k3kSystemNamespace
-		if addon.SecretNamespace != "" {
-			namespace = addon.SecretNamespace
-		}
-
-		nn := types.NamespacedName{
-			Name:      addon.SecretRef,
-			Namespace: namespace,
-		}
-
-		var addons v1.Secret
-		if err := s.client.Get(ctx, nn, &addons); err != nil {
-			return nil, err
-		}
-
-		clusterAddons := v1.Secret{
-			TypeMeta: metav1.TypeMeta{
-				Kind:       "Secret",
-				APIVersion: "v1",
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      addons.Name,
-				Namespace: s.cluster.Namespace,
-			},
-			Data: make(map[string][]byte, len(addons.Data)),
-		}
-		for k, v := range addons.Data {
-			clusterAddons.Data[k] = v
-		}
-
-		if err := s.client.Create(ctx, &clusterAddons); err != nil {
-			return nil, err
-		}
-
-		name := "varlibrancherk3smanifests" + addon.SecretRef
-		volume := v1.Volume{
-			Name: name,
-			VolumeSource: v1.VolumeSource{
-				Secret: &v1.SecretVolumeSource{
-					SecretName: addon.SecretRef,
-				},
-			},
-		}
-		volumes = append(volumes, volume)
-
-		volumeMount := v1.VolumeMount{
-			Name:      name,
-			MountPath: "/var/lib/rancher/k3s/server/manifests/" + addon.SecretRef,
-			// changes to this part of the filesystem shouldn't be done manually. The secret should be updated instead.
-			ReadOnly: true,
-		}
-		volumeMounts = append(volumeMounts, volumeMount)
+	replicas = *cluster.Spec.Servers - 1
+	if init {
+		replicas = 1
 	}
 
-	selector := metav1.LabelSelector{
-		MatchLabels: map[string]string{
-			"cluster": s.cluster.Name,
-			"role":    "server",
-		},
-	}
-
-	startupCommand, err := s.setupStartCommand()
-	if err != nil {
-		return nil, err
-	}
-	podSpec := s.podSpec(image, name, persistent, startupCommand)
-	podSpec.Volumes = append(podSpec.Volumes, volumes...)
-	podSpec.Containers[0].VolumeMounts = append(podSpec.Containers[0].VolumeMounts, volumeMounts...)
-
-	ss := &apps.StatefulSet{
+	return &apps.StatefulSet{
 		TypeMeta: metav1.TypeMeta{
-			Kind:       "StatefulSet",
+			Kind:       "Deployment",
 			APIVersion: "apps/v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: s.cluster.Namespace,
-			Labels:    selector.MatchLabels,
+			Name:      cluster.Name + "-" + name,
+			Namespace: util.ClusterNamespace(cluster),
 		},
 		Spec: apps.StatefulSetSpec{
 			Replicas:    &replicas,
-			ServiceName: headlessServiceName(s.cluster.Name),
-			Selector:    &selector,
+			ServiceName: cluster.Name + "-" + name + "-headless",
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"cluster": cluster.Name,
+					"role":    "server",
+					"init":    strconv.FormatBool(init),
+				},
+			},
+			VolumeClaimTemplates: []v1.PersistentVolumeClaim{
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       "PersistentVolumeClaim",
+						APIVersion: "v1",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "varlibrancherk3s",
+						Namespace: util.ClusterNamespace(cluster),
+					},
+					Spec: v1.PersistentVolumeClaimSpec{
+						AccessModes:      []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+						StorageClassName: &cluster.Spec.Persistence.StorageClassName,
+						Resources: v1.ResourceRequirements{
+							Requests: v1.ResourceList{
+								"storage": resource.MustParse(cluster.Spec.Persistence.StorageRequestSize),
+							},
+						},
+					},
+				},
+				{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       "PersistentVolumeClaim",
+						APIVersion: "v1",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "varlibkubelet",
+						Namespace: util.ClusterNamespace(cluster),
+					},
+					Spec: v1.PersistentVolumeClaimSpec{
+						Resources: v1.ResourceRequirements{
+							Requests: v1.ResourceList{
+								"storage": resource.MustParse(cluster.Spec.Persistence.StorageRequestSize),
+							},
+						},
+						AccessModes:      []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+						StorageClassName: &cluster.Spec.Persistence.StorageClassName,
+					},
+				},
+			},
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: selector.MatchLabels,
+					Labels: map[string]string{
+						"cluster": cluster.Name,
+						"role":    "server",
+						"init":    strconv.FormatBool(init),
+					},
 				},
-				Spec: podSpec,
+				Spec: s.podSpec(ctx, image, name, true),
 			},
 		},
 	}
-	if s.cluster.Spec.Persistence.Type == v1alpha1.DynamicNodesType {
-		ss.Spec.VolumeClaimTemplates = []v1.PersistentVolumeClaim{pvClaim}
-	}
-
-	return ss, nil
-}
-
-func (s *Server) setupDynamicPersistence() v1.PersistentVolumeClaim {
-	return v1.PersistentVolumeClaim{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "PersistentVolumeClaim",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "varlibrancherk3s",
-			Namespace: s.cluster.Namespace,
-		},
-		Spec: v1.PersistentVolumeClaimSpec{
-			AccessModes:      []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
-			StorageClassName: s.cluster.Spec.Persistence.StorageClassName,
-			Resources: v1.VolumeResourceRequirements{
-				Requests: v1.ResourceList{
-					"storage": resource.MustParse(s.cluster.Status.Persistence.StorageRequestSize),
-				},
-			},
-		},
-	}
-
-}
-
-func (s *Server) setupStartCommand() (string, error) {
-	var output bytes.Buffer
-
-	tmpl := singleServerTemplate
-	if *s.cluster.Spec.Servers > 1 {
-		tmpl = HAServerTemplate
-	}
-	tmplCmd, err := template.New("").Parse(tmpl)
-	if err != nil {
-		return "", err
-	}
-	if err := tmplCmd.Execute(&output, map[string]string{
-		"ETCD_DIR":      "/var/lib/rancher/k3s/server/db/etcd",
-		"INIT_CONFIG":   "/opt/rancher/k3s/init/config.yaml",
-		"SERVER_CONFIG": "/opt/rancher/k3s/server/config.yaml",
-		"EXTRA_ARGS":    strings.Join(s.cluster.Spec.ServerArgs, " "),
-	}); err != nil {
-		return "", err
-	}
-	return output.String(), nil
 }

pkg/controller/cluster/server/service.go

@@ -1,121 +1,79 @@
 package server
 
 import (
+	"strconv"
+
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1"
-	"github.com/rancher/k3k/pkg/controller"
+	"github.com/rancher/k3k/pkg/controller/util"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-func Service(cluster *v1alpha1.Cluster) *v1.Service {
-	service := &v1.Service{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Service",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      ServiceName(cluster.Name),
-			Namespace: cluster.Namespace,
-		},
-		Spec: v1.ServiceSpec{
-			Type: v1.ServiceTypeClusterIP,
-			Selector: map[string]string{
-				"cluster": cluster.Name,
-				"role":    "server",
-			},
-		},
-	}
-
-	k3sServerPort := v1.ServicePort{
-		Name:     "k3s-server-port",
-		Protocol: v1.ProtocolTCP,
-		Port:     serverPort,
-	}
-
-	k3sServicePort := v1.ServicePort{
-		Name:       "k3s-service-port",
-		Protocol:   v1.ProtocolTCP,
-		Port:       servicePort,
-		TargetPort: intstr.FromInt(serverPort),
-	}
-
-	etcdPort := v1.ServicePort{
-		Name:     "k3s-etcd-port",
-		Protocol: v1.ProtocolTCP,
-		Port:     etcdPort,
-	}
-
+func (s *Server) Service(cluster *v1alpha1.Cluster) *v1.Service {
+	serviceType := v1.ServiceTypeClusterIP
 	if cluster.Spec.Expose != nil {
-		nodePortConfig := cluster.Spec.Expose.NodePort
-		if nodePortConfig != nil {
-			service.Spec.Type = v1.ServiceTypeNodePort
-
-			if nodePortConfig.ServerPort != nil {
-				k3sServerPort.NodePort = *nodePortConfig.ServerPort
-			}
-			if nodePortConfig.ServicePort != nil {
-				k3sServicePort.NodePort = *nodePortConfig.ServicePort
-			}
-			if nodePortConfig.ETCDPort != nil {
-				etcdPort.NodePort = *nodePortConfig.ETCDPort
+		if cluster.Spec.Expose.NodePort != nil {
+			if cluster.Spec.Expose.NodePort.Enabled {
+				serviceType = v1.ServiceTypeNodePort
 			}
 		}
 	}
 
-	service.Spec.Ports = append(
-		service.Spec.Ports,
-		k3sServicePort,
-		etcdPort,
-		k3sServerPort,
-	)
-
-	return service
-}
-
-func (s *Server) StatefulServerService() *v1.Service {
 	return &v1.Service{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Service",
 			APIVersion: "v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      headlessServiceName(s.cluster.Name),
-			Namespace: s.cluster.Namespace,
+			Name:      "k3k-server-service",
+			Namespace: util.ClusterNamespace(cluster),
 		},
 		Spec: v1.ServiceSpec{
-			Type:      v1.ServiceTypeClusterIP,
-			ClusterIP: v1.ClusterIPNone,
+			Type: serviceType,
 			Selector: map[string]string{
-				"cluster": s.cluster.Name,
+				"cluster": cluster.Name,
 				"role":    "server",
 			},
 			Ports: []v1.ServicePort{
 				{
 					Name:     "k3s-server-port",
 					Protocol: v1.ProtocolTCP,
-					Port:     serverPort,
-				},
-				{
-					Name:       "k3s-service-port",
-					Protocol:   v1.ProtocolTCP,
-					Port:       servicePort,
-					TargetPort: intstr.FromInt(serverPort),
-				},
-				{
-					Name:     "k3s-etcd-port",
-					Protocol: v1.ProtocolTCP,
-					Port:     etcdPort,
+					Port:     port,
 				},
 			},
 		},
 	}
 }
 
-func ServiceName(clusterName string) string {
-	return controller.SafeConcatNameWithPrefix(clusterName, "service")
-}
-
-func headlessServiceName(clusterName string) string {
-	return controller.SafeConcatNameWithPrefix(clusterName, "service", "headless")
+func (s *Server) StatefulServerService(cluster *v1alpha1.Cluster, init bool) *v1.Service {
+	name := serverName
+	if init {
+		name = initServerName
+	}
+	return &v1.Service{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Service",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      cluster.Name + "-" + name + "-headless",
+			Namespace: util.ClusterNamespace(cluster),
+		},
+		Spec: v1.ServiceSpec{
+			Type:      v1.ServiceTypeClusterIP,
+			ClusterIP: v1.ClusterIPNone,
+			Selector: map[string]string{
+				"cluster": cluster.Name,
+				"role":    "server",
+				"init":    strconv.FormatBool(init),
+			},
+			Ports: []v1.ServicePort{
+				{
+					Name:     "k3s-server-port",
+					Protocol: v1.ProtocolTCP,
+					Port:     6443,
+				},
+			},
+		},
+	}
 }