Skip to content

Commit

Permalink
feat: add konnect API group
Browse files Browse the repository at this point in the history
  • Loading branch information
pmalek committed Jul 29, 2024
1 parent 10d6404 commit c31903f
Show file tree
Hide file tree
Showing 159 changed files with 942 additions and 287 deletions.
14 changes: 4 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -200,22 +200,16 @@ generate.api: controller-gen
# this will generate the custom typed clients needed for end-users implementing logic in Go to use our API types.
.PHONY: generate.clientsets
generate.clientsets: client-gen
# We create a symlink to the apis/ directory as a hack because currently
# client-gen does not properly support the use of api/ as your API
# directory.
#
# See: https://github.com/kubernetes/code-generator/issues/167
ln -sf api apis
$(CLIENT_GEN) \
--go-header-file ./hack/generators/boilerplate.go.txt \
--clientset-name clientset \
--input-base '' \
--input $(REPO)/apis/v1alpha1 \
--input $(REPO)/apis/v1beta1 \
--input $(REPO)/$(API_DIR)/gateway-operator/v1alpha1 \
--input $(REPO)/$(API_DIR)/gateway-operator/v1beta1 \
--input $(REPO)/$(API_DIR)/konnect/v1alpha1 \
--output-dir pkg/ \
--output-pkg $(REPO)/pkg/
rm apis
find ./pkg/clientset/ -type f -name '*.go' -exec sed -i '' -e 's/github.com\/kong\/gateway-operator\/apis/github.com\/kong\/gateway-operator\/api/gI' {} \; &> /dev/null

.PHONY: generate.rbacs
generate.rbacs: kic-role-generator
$(KIC_ROLE_GENERATOR) --force
Expand Down
10 changes: 5 additions & 5 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@ resources:
controller: true
group: gateway-operator.konghq.com
kind: ControlPlane
path: github.com/kong/gateway-operator/api/v1beta1
path: github.com/kong/gateway-operator/api/gateway-operator/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
controller: true
group: gateway-operator.konghq.com
kind: DataPlane
path: github.com/kong/gateway-operator/api/v1beta1
path: github.com/kong/gateway-operator/api/gateway-operator/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
group: gateway-operator.konghq.com
kind: GatewayConfiguration
path: github.com/kong/gateway-operator/api/v1beta1
path: github.com/kong/gateway-operator/api/gateway-operator/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
controller: true
group: gateway-operator.konghq.com
kind: AIGateway
path: github.com/kong/gateway-operator/api/v1alpha1
path: github.com/kong/gateway-operator/api/gateway-operator/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
group: gateway-operator.konghq.com
kind: DataPlaneMetricsExtension
path: github.com/kong/gateway-operator/api/v1alpha1
path: github.com/kong/gateway-operator/api/gateway-operator/v1alpha1
version: v1alpha1
version: "3"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions api/gateway-operator/v1alpha1/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package v1alpha1

// +groupName=gateway-operator.konghq.com
// +groupGoName=gatewayoperator
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"

"github.com/kong/gateway-operator/api/v1alpha1"
"github.com/kong/gateway-operator/api/gateway-operator/v1alpha1"
)

// Install is a callback from client-gen to add the scheme to the client
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/kong/gateway-operator/api/v1alpha1"
"github.com/kong/gateway-operator/api/gateway-operator/v1alpha1"
)

func init() {
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions api/gateway-operator/v1beta1/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package v1beta1

// +groupName=gateway-operator.konghq.com
// +groupGoName=gatewayoperator
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"

"github.com/kong/gateway-operator/api/v1beta1"
"github.com/kong/gateway-operator/api/gateway-operator/v1beta1"
)

// Install is a callback from client-gen to add the scheme to the client
Expand Down
File renamed without changes.

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

4 changes: 4 additions & 0 deletions api/konnect/v1alpha1/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package v1alpha1

// +groupName=konnect.konghq.com
// +groupGoName=konnect
36 changes: 36 additions & 0 deletions api/konnect/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Copyright 2022 Kong 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 v1alpha1 contains API Schema definitions for the operator konnect v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=konnect.konghq.com
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// SchemeGroupVersion is group version used to register these objects
SchemeGroupVersion = schema.GroupVersion{Group: "konnect.konghq.com", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
171 changes: 171 additions & 0 deletions config/crd/bases/konnect.konghq.com_konnectapiauthconfigurations.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
name: konnectapiauthconfigurations.konnect.konghq.com
spec:
group: konnect.konghq.com
names:
kind: KonnectAPIAuthConfiguration
listKind: KonnectAPIAuthConfigurationList
plural: konnectapiauthconfigurations
singular: konnectapiauthconfiguration
scope: Cluster
versions:
- additionalPrinterColumns:
- description: The API authentication information is valid
jsonPath: .status.conditions[?(@.type=='Valid')].status
name: Valid
type: string
- description: Konnect Organization ID this API authentication configuration belongs
to.
jsonPath: .status.conditions.organizationID
name: OrgID
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: KonnectAPIAuthConfiguration is the Schema for the Konnect configuration
type.
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: Spec is the specification of the KonnectAPIAuthConfiguration
resource.
properties:
serverURL:
description: ServerURL is the URL of the Konnect server.
enum:
- us.api.konghq.com
- eu.api.konghq.com
- au.api.konghq.com
type: string
x-kubernetes-validations:
- message: Server URL is immutable
rule: self == oldSelf
token:
description: Token is the Konnect token used to authenticate with
the Konnect API.
type: string
required:
- serverURL
- token
type: object
status:
description: Status is the status of the KonnectAPIAuthConfiguration resource.
properties:
conditions:
default:
- lastTransitionTime: "1970-01-01T00:00:00Z"
message: Waiting for controller
reason: Pending
status: Unknown
type: Valid
description: Conditions describe the status of the Konnect configuration.
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
maxItems: 8
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
organizationID:
description: OrganizationID is the unique identifier of the organization
in Konnect.
type: string
type: object
type: object
x-kubernetes-validations:
- message: Konnect tokens have to start with spat_ or kpat_
rule: self.spec.token.startsWith('spat_') || self.spec.token.startsWith('kpat_')
- message: Token is required once set
rule: '!has(oldSelf.spec.token) || has(self.spec.token)'
- message: Server URL is required once set
rule: '!has(oldSelf.spec.serverURL) || has(self.spec.serverURL)'
served: true
storage: true
subresources: {}
Loading

0 comments on commit c31903f

Please sign in to comment.