Skip to content

Commit 134d019

Browse files
authored
Merge pull request #3 from k8s-proxmox/repository-transfer
transfer repo from sp-yduck to k8s-proxmox
2 parents 850a908 + cc864be commit 134d019

File tree

7 files changed

+44
-44
lines changed

7 files changed

+44
-44
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Proxmox Cloud Controller Manager
44

5-
This repository contains the Kubernetes cloud-controller-manager for Proxmox VE. Proxmox Cloud Controller Manager is compatible with [cluster-api-provider-proxmox](https://github.com/sp-yduck/cluster-api-provider-proxmox) so that machine controller of CAPI can match the nodes with their machine object. (See [machine-controller](https://cluster-api.sigs.k8s.io/developer/architecture/controllers/machine.html#machine--controller) for how it works)
5+
This repository contains the Kubernetes cloud-controller-manager for Proxmox VE. Proxmox Cloud Controller Manager is compatible with [cluster-api-provider-proxmox](https://github.com/k8s-proxmox/cluster-api-provider-proxmox) so that machine controller of CAPI can match the nodes with their machine object. (See [machine-controller](https://cluster-api.sigs.k8s.io/developer/architecture/controllers/machine.html#machine--controller) for how it works)
66

77
## Feature
88
### Node lifecycle controller

cmd/proxmox-cloud-controller-manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
3737
"k8s.io/klog/v2"
3838

39-
"github.com/sp-yduck/cloud-provider-proxmox/pkg/cloudprovider"
39+
"github.com/k8s-proxmox/cloud-provider-proxmox/pkg/cloudprovider"
4040
)
4141

4242
func main() {

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module github.com/sp-yduck/cloud-provider-proxmox
1+
module github.com/k8s-proxmox/cloud-provider-proxmox
22

33
go 1.20
44

55
require (
6+
github.com/k8s-proxmox/proxmox-go v0.0.0-alpha25
67
github.com/pkg/errors v0.9.1
7-
github.com/sp-yduck/proxmox-go v0.0.0-alpha22
88
github.com/spf13/pflag v1.0.5
99
github.com/stretchr/testify v1.8.4
1010
gopkg.in/yaml.v3 v3.0.1
@@ -111,4 +111,4 @@ require (
111111
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112112
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
113113
sigs.k8s.io/yaml v1.3.0 // indirect
114-
)
114+
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
216216
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
217217
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
218218
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
219+
github.com/k8s-proxmox/proxmox-go v0.0.0-alpha25 h1:vPkQUj+1ZsJNhxFktsWB9+efgGIWJ8VmgSgq9OJKxPI=
220+
github.com/k8s-proxmox/proxmox-go v0.0.0-alpha25/go.mod h1:ZSAdc9vVAEcIhbNkZxURWTY+k59cXUy9mswp5ofMM40=
219221
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
220222
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
221223
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -265,8 +267,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
265267
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
266268
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
267269
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
268-
github.com/sp-yduck/proxmox-go v0.0.0-alpha22 h1:xMY7SBfieHUXMZY0f7AShO2fmGJtZZkmGbI/9PnmQ/c=
269-
github.com/sp-yduck/proxmox-go v0.0.0-alpha22/go.mod h1:iEI7ilRwyUaWvoxuXs/30UJ2f8Z2TWXCW1cZ3QeU2JY=
270270
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
271271
github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
272272
github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=

manifests/cloud-controller-manager.yaml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ roleRef:
1414
kind: ClusterRole
1515
name: cluster-admin
1616
subjects:
17-
- kind: ServiceAccount
18-
name: proxmox-cloud-controller-manager
19-
namespace: kube-system
17+
- kind: ServiceAccount
18+
name: proxmox-cloud-controller-manager
19+
namespace: kube-system
2020
---
2121
apiVersion: apps/v1
2222
kind: DaemonSet
@@ -36,41 +36,41 @@ spec:
3636
spec:
3737
serviceAccountName: proxmox-cloud-controller-manager
3838
containers:
39-
- name: cloud-controller-manager
40-
image: spyduck/cloud-provider-proxmox:latest
41-
command:
42-
- /usr/local/bin/cloud-controller-manager
43-
- --cloud-provider=proxmox
44-
- --cloud-config=/etc/proxmox/config.yaml
45-
- --leader-elect=true
46-
- --use-service-account-credentials
47-
- --controllers=cloud-node,cloud-node-lifecycle
48-
volumeMounts:
49-
- name: cloud-config
50-
mountPath: /etc/proxmox
51-
readOnly: true
52-
livenessProbe:
53-
httpGet:
54-
path: /healthz
55-
port: 10258
56-
scheme: HTTPS
57-
initialDelaySeconds: 20
58-
periodSeconds: 30
59-
timeoutSeconds: 5
39+
- name: cloud-controller-manager
40+
image: ghcr.io/k8s-proxmox/cloud-provider-proxmox:latest
41+
command:
42+
- /usr/local/bin/cloud-controller-manager
43+
- --cloud-provider=proxmox
44+
- --cloud-config=/etc/proxmox/config.yaml
45+
- --leader-elect=true
46+
- --use-service-account-credentials
47+
- --controllers=cloud-node,cloud-node-lifecycle
48+
volumeMounts:
49+
- name: cloud-config
50+
mountPath: /etc/proxmox
51+
readOnly: true
52+
livenessProbe:
53+
httpGet:
54+
path: /healthz
55+
port: 10258
56+
scheme: HTTPS
57+
initialDelaySeconds: 20
58+
periodSeconds: 30
59+
timeoutSeconds: 5
6060
volumes:
6161
- name: cloud-config
6262
secret:
6363
secretName: cloud-config
6464
tolerations:
65-
- key: node.cloudprovider.kubernetes.io/uninitialized
66-
value: "true"
67-
effect: NoSchedule
68-
- key: node-role.kubernetes.io/control-plane
69-
operator: Exists
70-
effect: NoSchedule
71-
- key: node-role.kubernetes.io/master
72-
operator: Exists
73-
effect: NoSchedule
65+
- key: node.cloudprovider.kubernetes.io/uninitialized
66+
value: "true"
67+
effect: NoSchedule
68+
- key: node-role.kubernetes.io/control-plane
69+
operator: Exists
70+
effect: NoSchedule
71+
- key: node-role.kubernetes.io/master
72+
operator: Exists
73+
effect: NoSchedule
7474
nodeSelector:
7575
node-role.kubernetes.io/control-plane: ""
7676
---

pkg/cloudprovider/instances.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/sp-yduck/proxmox-go/api"
8-
"github.com/sp-yduck/proxmox-go/proxmox"
9-
"github.com/sp-yduck/proxmox-go/rest"
7+
"github.com/k8s-proxmox/proxmox-go/api"
8+
"github.com/k8s-proxmox/proxmox-go/proxmox"
9+
"github.com/k8s-proxmox/proxmox-go/rest"
1010
v1 "k8s.io/api/core/v1"
1111
cloudprovider "k8s.io/cloud-provider"
1212
"k8s.io/klog/v2"

pkg/cloudprovider/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

7-
"github.com/sp-yduck/proxmox-go/proxmox"
7+
"github.com/k8s-proxmox/proxmox-go/proxmox"
88
"github.com/stretchr/testify/suite"
99
v1 "k8s.io/api/core/v1"
1010
)

0 commit comments

Comments
 (0)