Skip to content

Commit

Permalink
feat(agent): set crossplane user agent (#92)
Browse files Browse the repository at this point in the history 
* feat(agent): set crossplane user agent

Signed-off-by: Christopher Haar <[email protected]>

* feat(agent): set crossplane user agent

Signed-off-by: Christopher Haar <[email protected]>

---------

Signed-off-by: Christopher Haar <[email protected]>
  • Loading branch information
@haarchri
haarchri authored Jun 5, 2024
1 parent ff04259 commit 254f5f2
Show file tree
Hide file tree
Showing 9 changed files with 237 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export TERRAFORM_VERSION ?= 1.3.3

export TERRAFORM_PROVIDER_SOURCE ?= castai/castai
export TERRAFORM_PROVIDER_REPO ?= https://github.com/castai/terraform-provider-castai
export TERRAFORM_PROVIDER_VERSION ?= 6.7.1
export TERRAFORM_PROVIDER_VERSION ?= 6.10.0
export TERRAFORM_PROVIDER_DOWNLOAD_NAME ?= terraform-provider-castai
export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX ?= https://releases.hashicorp.com/$(TERRAFORM_PROVIDER_DOWNLOAD_NAME)/$(TERRAFORM_PROVIDER_VERSION)
export TERRAFORM_NATIVE_PROVIDER_BINARY ?= terraform-provider-castai_v6.7.1
Expand Down
66 changes: 66 additions & 0 deletions apis/castai/v1alpha1/zz_generated.deepcopy.go
View file

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

13 changes: 13 additions & 0 deletions apis/castai/v1alpha1/zz_nodeconfiguration_types.go
View file

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

10 changes: 10 additions & 0 deletions apis/castai/v1alpha1/zz_nodetemplate_types.go
View file

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

10 changes: 10 additions & 0 deletions cluster/images/crossplane-provider-castai/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ include ../../../build/makelib/common.mk

include ../../../build/makelib/imagelight.mk

# ====================================================================================
# Setup k8s tools

-include ../../../build/makelib/k8s_tools.mk

# ====================================================================================
# Setup xpkg

-include ../../../build/makelib/xpkg.mk

# ====================================================================================
# Targets

Expand Down
97 changes: 97 additions & 0 deletions config/provider-metadata.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,101 @@ resources:
timeouts: (Block, Optional) (see below for nested schema)
update: (String)
importStatements: []
castai_commitments:
subCategory: ""
description: Commitments represent cloud service provider reserved instances (Azure) and commited use discounts (GCP) that can be used by CAST AI autoscaler.
name: castai_commitments
title: castai_commitments Resource - terraform-provider-castai
examples:
- name: gcp_test
manifest: |-
{
"commitment_configs": [
{
"allowed_usage": 0.6,
"assignments": [
{
"cluster_id": "cluster-id-1"
},
{
"cluster_id": "cluster-id-2"
}
],
"matcher": [
{
"name": "test",
"region": "us-east4",
"type": "COMPUTE_OPTIMIZED_C2D"
}
],
"prioritization": true,
"status": "Inactive"
}
],
"gcp_cuds_json": "${file(\"./cuds.json\")}"
}
- name: azure_test
manifest: |-
{
"azure_reservations_csv": "${file(\"./reservations.csv\")}",
"commitment_configs": [
{
"allowed_usage": 0.9,
"assignments": [
{
"cluster_id": "cluster-id-3"
},
{
"cluster_id": "cluster-id-4"
}
],
"matcher": [
{
"name": "test-res-1",
"region": "eastus",
"type": "Standard_D32as_v4"
}
],
"prioritization": false,
"status": "Active"
}
]
}
argumentDocs:
allowed_usage: (Number) Allowed usage of the commitment. The value is between 0 (0%) and 1 (100%).
assignments: (Block List) List of assigned clusters for the commitment. If prioritization is enabled, the order of the assignments indicates the priority. The first assignment has the highest priority. (see below for nested schema)
azure_reservations: (List of Object) List of Azure reservations. (see below for nested schema)
azure_reservations_csv: (String) CSV file containing reservations exported from Azure.
cluster_id: (String) ID of the cluster to assign the commitment to.
commitment_configs: (Block List) List of commitment configurations. (see below for nested schema)
count: (Number)
cpu: (Number)
create: (String)
cud_id: (String)
cud_status: (String)
end_timestamp: (String)
gcp_cuds: (List of Object) List of GCP CUDs. (see below for nested schema)
gcp_cuds_json: (String) JSON file containing CUDs exported from GCP.
id: (String) The ID of this resource.
instance_type: (String)
matcher: '(Block List, Min: 1, Max: 1) Matcher used to map config to a commitment. (see below for nested schema)'
memory_mb: (Number)
name: (String) Name of the commitment to match.
plan: (String)
prioritization: (Boolean) If enabled, it's possible to assign priorities to the assigned clusters.
priority: (Number) Priority of the assignment. The lower the value, the higher the priority. 1 is the highest priority.
region: (String) Region of the commitment to match.
reservation_id: (String)
reservation_status: (String)
scope: (String)
scope_resource_group: (String)
scope_subscription: (String)
start_timestamp: (String)
status: (String) Status of the commitment in CAST AI.
timeouts: (Block, Optional) (see below for nested schema)
type: (String) Type of the commitment to match. For compute resources, it's the type of the machine.
update: (String)
importStatements: []
castai_eks_cluster:
subCategory: ""
description: EKS cluster resource allows connecting an existing EKS cluster to CAST AI.
Expand Down Expand Up @@ -249,6 +344,7 @@ resources:
volume_kms_key_arn: (String) AWS KMS key ARN for encrypting EBS volume attached to the node
volume_throughput: (Number) AWS EBS volume throughput in MiB/s to be used for CAST provisioned nodes
volume_type: '(String) AWS EBS volume type to be used for CAST provisioned nodes. One of: gp3, io1, io2'
zones: (List of String, Deprecated) List of preferred availability zones to choose from when provisioning new nodes.
importStatements:
- $ terraform import castai_node_configuration.default <cluster_id>/default
- $ terraform import 'module.castai-eks-cluster.castai_node_configuration.this["default"]' <cluster_id>/default
Expand Down Expand Up @@ -284,6 +380,7 @@ resources:
affinity: (Block List) (see below for nested schema)
architectures: '(List of String) List of acceptable instance CPU architectures, the default is amd64. Allowed values: amd64, arm64.'
az_name: (String) Availability zone name.
azs: (List of String) The list of AZ names to consider for the node template, if empty or not set all AZs are considered.
cluster_id: (String) CAST AI cluster id.
compute_optimized: (Boolean) Compute optimized instance constraint - will only pick compute optimized nodes if true.
configuration_id: (String) CAST AI node configuration id to be used for node template.
Expand Down
2 changes: 1 addition & 1 deletion config/schema.json
View file

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions package/crds/castai.upbound.io_nodeconfigurations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,13 @@ spec:
items:
type: string
type: array
zones:
description: |-
(List of String, Deprecated) List of preferred availability zones to choose from when provisioning new nodes.
List of preferred availability zones to choose from when provisioning new nodes.
items:
type: string
type: array
type: object
type: array
image:
Expand Down Expand Up @@ -574,6 +581,13 @@ spec:
items:
type: string
type: array
zones:
description: |-
(List of String, Deprecated) List of preferred availability zones to choose from when provisioning new nodes.
List of preferred availability zones to choose from when provisioning new nodes.
items:
type: string
type: array
type: object
type: array
image:
Expand Down Expand Up @@ -952,6 +966,13 @@ spec:
items:
type: string
type: array
zones:
description: |-
(List of String, Deprecated) List of preferred availability zones to choose from when provisioning new nodes.
List of preferred availability zones to choose from when provisioning new nodes.
items:
type: string
type: array
type: object
type: array
id:
Expand Down
18 changes: 18 additions & 0 deletions package/crds/castai.upbound.io_nodetemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ spec:
items:
type: string
type: array
azs:
description: The list of AZ names to consider for the node
template, if empty or not set all AZs are considered.
items:
type: string
type: array
computeOptimized:
description: Compute optimized instance constraint - will
only pick compute optimized nodes if true.
Expand Down Expand Up @@ -653,6 +659,12 @@ spec:
items:
type: string
type: array
azs:
description: The list of AZ names to consider for the node
template, if empty or not set all AZs are considered.
items:
type: string
type: array
computeOptimized:
description: Compute optimized instance constraint - will
only pick compute optimized nodes if true.
Expand Down Expand Up @@ -1078,6 +1090,12 @@ spec:
items:
type: string
type: array
azs:
description: The list of AZ names to consider for the node
template, if empty or not set all AZs are considered.
items:
type: string
type: array
computeOptimized:
description: Compute optimized instance constraint - will
only pick compute optimized nodes if true.
Expand Down

0 comments on commit 254f5f2

Please sign in to comment.