Skip to content

Commit

Permalink
implement AddressSet CRD and support in firewall controller
Browse files Browse the repository at this point in the history
  • Loading branch information
AshleyDumaine committed Nov 26, 2024
1 parent 1134d10 commit 0c44edf
Show file tree
Hide file tree
Showing 18 changed files with 601 additions and 18 deletions.
10 changes: 9 additions & 1 deletion PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ resources:
path: github.com/linode/cluster-api-provider-linode/api/v1alpha2
version: v1alpha2
webhooks:
validation: true
defaulting: true
validation: true
webhookVersion: v1
- api:
crdVersion: v1
Expand All @@ -178,4 +178,12 @@ resources:
webhooks:
validation: true
webhookVersion: v1
- api:
crdVersion: v1
namespaced: true
domain: cluster.x-k8s.io
group: infrastructure
kind: AddressSet
path: github.com/linode/cluster-api-provider-linode/api/v1alpha2
version: v1alpha2
version: "3"
66 changes: 66 additions & 0 deletions api/v1alpha2/addressset_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
Copyright 2023 Akamai Technologies, Inc.
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.
*/

package v1alpha2

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

// AddressSetSpec defines the desired state of AddressSet
type AddressSetSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file

IPv4 *[]string `json:"ipv4,omitempty"`
IPv6 *[]string `json:"ipv6,omitempty"`
}

// AddressSetStatus defines the observed state of AddressSet
type AddressSetStatus struct {
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
// Important: Run "make" to regenerate code after modifying this file
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:path=addressset,scope=Namespaced,categories=cluster-api,shortName=addrset
// +kubebuilder:metadata:labels="clusterctl.cluster.x-k8s.io/move-hierarchy=true"

// AddressSet is the Schema for the addresssets API
type AddressSet struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec AddressSetSpec `json:"spec,omitempty"`
Status AddressSetStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

// AddressSetList contains a list of AddressSet
type AddressSetList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []AddressSet `json:"items"`
}

func init() {
SchemeBuilder.Register(&AddressSet{}, &AddressSetList{})
}
3 changes: 3 additions & 0 deletions api/v1alpha2/linodefirewall_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ type FirewallRule struct {
// +kubebuilder:validation:Enum=TCP;UDP;ICMP;IPENCAP
Protocol linodego.NetworkProtocol `json:"protocol"`
Addresses *NetworkAddresses `json:"addresses"`
// AddressSetRefs is a list of references to AddressSets
// If Addresses is present, AddressSetRefs will be ignored
AddressSetRefs []*corev1.ObjectReference `json:"addressSetRefs,omitempty"`
}

// NetworkAddresses holds a list of IPv4 and IPv6 addresses
Expand Down
118 changes: 118 additions & 0 deletions api/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_addressset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
labels:
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
name: addressset.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
names:
categories:
- cluster-api
kind: AddressSet
listKind: AddressSetList
plural: addressset
shortNames:
- addrset
singular: addressset
scope: Namespaced
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: AddressSet is the Schema for the addresssets 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
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:
description: AddressSetSpec defines the desired state of AddressSet
properties:
ipv4:
items:
type: string
type: array
ipv6:
items:
type: string
type: array
type: object
status:
description: AddressSetStatus defines the observed state of AddressSet
type: object
type: object
served: true
storage: true
subresources:
status: {}
54 changes: 54 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_addresssets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
name: addresssets.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
names:
kind: AddressSet
listKind: AddressSetList
plural: addresssets
singular: addressset
scope: Namespaced
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: AddressSet is the Schema for the addresssets 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
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:
description: AddressSetSpec defines the desired state of AddressSet
properties:
foo:
description: Foo is an example field of AddressSet. Edit addressset_types.go
to remove/update
type: string
type: object
status:
description: AddressSetStatus defines the observed state of AddressSet
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading

0 comments on commit 0c44edf

Please sign in to comment.