Skip to content
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ build-manager: generate fmt vet ## Build manager binary.
go build -o bin/manager ./cmd/manager/main.go

run: manifests generate fmt vet ## Run a controller from your host.
go run ./cmd/manager/main.go
go run ./cmd/manager/main.go --agent-image "ghcr.io/jodevsa/wireguard-operator/agent:dev-last-today-131"



Expand Down
2 changes: 1 addition & 1 deletion cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func main() {
}

if wgImage == "" {
setupLog.Error(fmt.Errorf("--wireguard-container-image flag is not set"), "unable to start manager")
setupLog.Error(fmt.Errorf("--agent-image flag is not set"), "unable to start manager")
os.Exit(1)
}

Expand Down
46 changes: 24 additions & 22 deletions config/crd/bases/vpn.wireguard-operator.io_wireguardpeers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: wireguardpeers.vpn.wireguard-operator.io
spec:
group: vpn.wireguard-operator.io
Expand All @@ -21,14 +20,19 @@ spec:
description: WireguardPeer is the Schema for the wireguardpeers API
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'
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'
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
Expand All @@ -46,8 +50,10 @@ spec:
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the Secret or its key must be
Expand All @@ -56,13 +62,15 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
required:
- secretKeyRef
type: object
address:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
description: |-
INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file
The address of the peer.'
The address of the peer.
type: string
disabled:
description: Set to true to temporarily disable the peer.
Expand Down Expand Up @@ -148,10 +156,10 @@ spec:
of the peer.
properties:
config:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file A string field that contains the current configuration
for the Wireguard peer.'
description: |-
INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
Important: Run "make" to regenerate code after modifying this file
A string field that contains the current configuration for the Wireguard peer.
type: string
message:
description: A string field that provides additional information about
Expand All @@ -169,9 +177,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
43 changes: 29 additions & 14 deletions config/crd/bases/vpn.wireguard-operator.io_wireguards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: wireguards.vpn.wireguard-operator.io
spec:
group: vpn.wireguard-operator.io
Expand All @@ -21,14 +20,19 @@ spec:
description: Wireguard is the Schema for the wireguards API
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'
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'
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
Expand Down Expand Up @@ -77,12 +81,16 @@ spec:
status:
description: WireguardStatus defines the observed state of Wireguard
properties:
UniqueIdentifier:
type: string
address:
description: A string field that specifies the address for the Wireguard
VPN server that is currently being used.
type: string
dns:
type: string
dnssearchdomain:
type: string
message:
description: A string field that provides additional information about
the status of Wireguard. This could include error messages or other
Expand All @@ -92,6 +100,19 @@ spec:
description: A string field that specifies the port for the Wireguard
VPN server that is currently being used.
type: string
publickey:
type: string
resources:
items:
properties:
name:
type: string
status:
type: string
type:
type: string
type: object
type: array
status:
description: A string field that represents the current status of
Wireguard. This could include values like ready, pending, or error.
Expand All @@ -102,9 +123,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
1 change: 0 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: manager-role
rules:
- apiGroups:
Expand Down
Loading