Skip to content

Commit

Permalink
chore: upgrade chart to 0.6 (#253)
Browse files Browse the repository at this point in the history 
* chore: upgrade the resource operator to 0.6

Signed-off-by: ericsyh <[email protected]>

* update crd

Signed-off-by: ericsyh <[email protected]>

* update crds

Signed-off-by: ericsyh <[email protected]>

---------

Signed-off-by: ericsyh <[email protected]>
  • Loading branch information
@ericsyh
ericsyh committed Sep 6, 2024
1 parent 2d6716f commit 28cf467
Show file tree
Hide file tree
Showing 24 changed files with 675 additions and 446 deletions.
4 changes: 2 additions & 2 deletions charts/pulsar-resources-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: v0.5.7
version: v0.6.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v0.5.7"
appVersion: "v0.6.0"

# This is a semver range of compatible Kubernetes versions. Helm will validate the version
# constraints when installing the chart and fail if the cluster runs an unsupported Kubernetes version
Expand Down
131 changes: 90 additions & 41 deletions charts/pulsar-resources-operator/crds/resource.streamnative.io_pulsarconnections.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
creationTimestamp: null
name: pulsarconnections.resource.streamnative.io
spec:
group: resource.streamnative.io
Expand Down Expand Up @@ -62,7 +63,10 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: PulsarConnection is the Schema for the pulsarconnections API
description: |-
PulsarConnection is the Schema for the pulsarconnections API
It represents a connection to a Pulsar cluster and includes both the desired state (Spec)
and the observed state (Status) of the connection.
properties:
apiVersion:
description: |-
Expand All @@ -82,34 +86,63 @@ spec:
metadata:
type: object
spec:
description: PulsarConnectionSpec defines the desired state of PulsarConnection
description: |-
PulsarConnectionSpec defines the desired state of PulsarConnection
It specifies the configuration for connecting to a Pulsar cluster.
For plaintext (non-TLS) Pulsar clusters:
- Set AdminServiceURL to "http://<admin-service-host>:<port>"
- Set BrokerServiceURL to "pulsar://<broker-service-host>:<port>"
For TLS-enabled Pulsar clusters:
- Set AdminServiceSecureURL to "https://<admin-service-host>:<port>"
- Set BrokerServiceSecureURL to "pulsar+ssl://<broker-service-host>:<port>"
- Optionally set BrokerClientTrustCertsFilePath if using custom CA certificates
properties:
adminServiceSecureURL:
description: AdminServiceSecureURL is the admin service url for secure
connection.
description: |-
AdminServiceSecureURL is the HTTPS URL for secure connections to the Pulsar admin service.
Use this for encrypted administrative operations.
pattern: ^https://.+$
type: string
adminServiceURL:
description: AdminServiceURL is the admin service url of the pulsar
cluster
description: |-
AdminServiceURL is the HTTP(S) URL for the Pulsar cluster's admin service.
This URL is used for administrative operations.
pattern: ^https?://.+$
type: string
authentication:
description: Authentication defines authentication configurations
description: |-
Authentication defines the authentication configuration for connecting to the Pulsar cluster.
It supports both token-based and OAuth2-based authentication methods.
properties:
oauth2:
description: PulsarAuthenticationOAuth2 indicates the parameters
which are need by pulsar OAuth2
description: |-
OAuth2 specifies the configuration for OAuth2-based authentication.
This includes all necessary parameters for setting up OAuth2 authentication with Pulsar.
For detailed information on the OAuth2 fields, refer to the PulsarAuthenticationOAuth2 struct.
properties:
audience:
description: |-
Audience is the intended recipient of the token. In Pulsar's context, this is usually
the URL of your Pulsar cluster or a specific identifier for your Pulsar service.
type: string
clientID:
description: ClientID is the OAuth2 client identifier issued
to the client during the registration process.
type: string
issuerEndpoint:
description: |-
IssuerEndpoint is the URL of the OAuth2 authorization server.
This is typically the base URL of your identity provider's OAuth2 service.
type: string
key:
description: ValueOrSecretRef is a string or a secret reference
of the authentication
description: |-
Key is either the client secret or the path to a JSON credentials file.
For confidential clients, this would be the client secret.
For public clients using JWT authentication, this would be the path to the JSON credentials file.
properties:
secretRef:
description: SecretKeyRef indicates a secret name and
Expand All @@ -127,6 +160,9 @@ spec:
type: string
type: object
scope:
description: |-
Scope is an optional field to request specific permissions from the OAuth2 server.
If not specified, the default scope defined by the OAuth2 server will be used.
type: string
required:
- audience
Expand All @@ -135,8 +171,10 @@ spec:
- key
type: object
token:
description: ValueOrSecretRef is a string or a secret reference
of the authentication
description: |-
Token specifies the configuration for token-based authentication.
This can be either a direct token value or a reference to a secret containing the token.
If using a secret, the token should be stored under the specified key in the secret.
properties:
secretRef:
description: SecretKeyRef indicates a secret name and key
Expand All @@ -154,48 +192,49 @@ spec:
type: object
type: object
brokerClientTrustCertsFilePath:
description: BrokerClientTrustCertsFilePath Path for the trusted TLS
certificate file for outgoing connection to a server (broker)
description: |-
BrokerClientTrustCertsFilePath is the file path to the trusted TLS certificate
for outgoing connections to Pulsar brokers. This is used for TLS verification.
type: string
brokerServiceSecureURL:
description: BrokerServiceSecureURL is the broker service url for
secure connection.
description: |-
BrokerServiceSecureURL is the TLS-enabled URL for secure connections to Pulsar brokers.
Use this for encrypted communications with the Pulsar cluster.
pattern: ^pulsar\+ssl://.+$
type: string
brokerServiceURL:
description: BrokerServiceURL is the broker service url of the pulsar
cluster
description: |-
BrokerServiceURL is the non-TLS URL for connecting to Pulsar brokers.
Use this for non-secure connections to the Pulsar cluster.
pattern: ^pulsar?://.+$
type: string
clusterName:
description: |-
ClusterName indicates the local cluster name of the pulsar cluster. It should
set when enabling the Geo Replication
ClusterName specifies the name of the local Pulsar cluster.
When setting up Geo-Replication between Pulsar instances, this should be enabled to identify the cluster.
type: string
type: object
status:
description: PulsarConnectionStatus defines the observed state of PulsarConnection
description: |-
PulsarConnectionStatus defines the observed state of PulsarConnection.
It provides information about the current status of the Pulsar connection.
properties:
conditions:
description: Represents the observations of a connection's current
state.
description: |-
Conditions represent the latest available observations of the connection's current state.
It follows the Kubernetes conventions for condition types and status.
The "Ready" condition type is typically used to indicate the overall status.
items:
description: |-
Condition contains details for one aspect of the current state of this API Resource.
---
This struct is intended for direct use as an array at the field path .status.conditions. For example,
type FooStatus struct{
// Represents the observations of a foo's current state.
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
// other fields
}
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: |-
Expand Down Expand Up @@ -260,14 +299,24 @@ spec:
description: |-
ObservedGeneration is the most recent generation observed for this resource.
It corresponds to the metadata generation, which is updated on mutation by the API Server.
This field is used to track whether the controller has processed the latest changes.
format: int64
type: integer
secretKeyHash:
description: SecretKeyHash is the hash of the secret ref
description: |-
SecretKeyHash is the hash of the secret reference used for authentication.
This is used to detect changes in the secret without exposing sensitive information.
The controller should update this hash when the secret changes.
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
40 changes: 21 additions & 19 deletions charts/pulsar-resources-operator/crds/resource.streamnative.io_pulsarfunctions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
creationTimestamp: null
name: pulsarfunctions.resource.streamnative.io
spec:
group: resource.streamnative.io
Expand Down Expand Up @@ -197,9 +198,10 @@ spec:
type: object
lifecyclePolicy:
description: |-
PulsarResourceLifeCyclePolicy indicates whether it will keep or delete the resource
in pulsar cluster after resource is deleted by controller
KeepAfterDeletion or CleanUpAfterDeletion
PulsarResourceLifeCyclePolicy defines the behavior for managing Pulsar resources
when the corresponding custom resource (CR) is deleted from the Kubernetes cluster.
This policy allows users to control whether Pulsar resources should be retained or
removed from the Pulsar cluster after the CR is deleted.
enum:
- CleanUpAfterDeletion
- KeepAfterDeletion
Expand Down Expand Up @@ -380,22 +382,16 @@ spec:
description: Represents the observations of a connection's current
state.
items:
description: |-
Condition contains details for one aspect of the current state of this API Resource.
---
This struct is intended for direct use as an array at the field path .status.conditions. For example,
type FooStatus struct{
// Represents the observations of a foo's current state.
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
// other fields
}
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: |-
Expand Down Expand Up @@ -468,3 +464,9 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
40 changes: 21 additions & 19 deletions charts/pulsar-resources-operator/crds/resource.streamnative.io_pulsargeoreplications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
creationTimestamp: null
name: pulsargeoreplications.resource.streamnative.io
spec:
group: resource.streamnative.io
Expand Down Expand Up @@ -79,9 +80,10 @@ spec:
x-kubernetes-map-type: atomic
lifecyclePolicy:
description: |-
PulsarResourceLifeCyclePolicy indicates whether it will keep or delete the resource
in pulsar cluster after resource is deleted by controller
KeepAfterDeletion or CleanUpAfterDeletion
PulsarResourceLifeCyclePolicy defines the behavior for managing Pulsar resources
when the corresponding custom resource (CR) is deleted from the Kubernetes cluster.
This policy allows users to control whether Pulsar resources should be retained or
removed from the Pulsar cluster after the CR is deleted.
enum:
- CleanUpAfterDeletion
- KeepAfterDeletion
Expand All @@ -98,22 +100,16 @@ spec:
description: Conditions Represents the observations of a connection's
current state.
items:
description: |-
Condition contains details for one aspect of the current state of this API Resource.
---
This struct is intended for direct use as an array at the field path .status.conditions. For example,
type FooStatus struct{
// Represents the observations of a foo's current state.
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
// other fields
}
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: |-
Expand Down Expand Up @@ -186,3 +182,9 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
Loading

0 comments on commit 28cf467

Please sign in to comment.