Skip to content

Commit

Permalink
Merge branch 'main' into integration-remove-unused-pytest-mark
Browse files Browse the repository at this point in the history
  • Loading branch information
addyess authored Nov 20, 2024
2 parents 6d60b13 + bfb3166 commit 927f7f0
Show file tree
Hide file tree
Showing 18 changed files with 2,329 additions and 187 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
ref: ${{ matrix.branch }}
fetch-depth: 0
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@0.29.0
with:
scan-type: "fs"
ignore-unfixed: true
Expand Down
14 changes: 14 additions & 0 deletions charms/worker/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,23 @@ parts:
rm -rf $CRAFT_PRIME/lib $CRAFT_PRIME/templates
mv $CRAFT_PRIME/k8s/lib $CRAFT_PRIME/lib
mv $CRAFT_PRIME/k8s/templates $CRAFT_PRIME/templates
actions:
pre-upgrade-check:
description: Run necessary pre-upgrade checks before executing a charm upgrade.

peers:
upgrade:
interface: upgrade


provides:
cos-agent:
interface: cos_agent
requires:
aws:
interface: aws-integration
azure:
interface: azure-integration
cluster:
interface: k8s-cluster
# interface to connect with the k8s charm to provide
Expand All @@ -100,3 +112,5 @@ requires:
interface: cos-k8s-tokens
containerd:
interface: containerd
gcp:
interface: gcp-integration
47 changes: 44 additions & 3 deletions charms/worker/k8s/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ config:
type: string
description: |
Labels can be used to organize and to select subsets of nodes in the
cluster. Declare node labels in key=value format, separated by spaces.
cluster. Declare node labels in key=value format, separated by spaces.
register-with-taints:
type: string
default: ""
Expand All @@ -161,6 +161,34 @@ config:
CIDR to use for Kubernetes services. After deployment it is
only possible to increase the size of the IP range. It is not possible to
change or shrink the address range after deployment.
local-storage-enabled:
type: boolean
default: true
description: |
Enable local storage provisioning. This will create a storage class
named "local-storage" that uses the hostPath provisioner. This is
useful for development and testing purposes. It is not recommended for
production use.
local-storage-local-path:
type: string
default: "/var/snap/k8s/common/rawfile-storage"
description: |
The path on the host where local storage will be provisioned. This
path must be writable by the kubelet. This is only used if
local-storage.enabled is set to true.
local-storage-reclaim-policy:
type: string
default: Delete
description: |
The reclaim policy for local storage. This can be either "Delete" or
"Retain". If set to "Delete", the storage will be deleted when the
PersistentVolumeClaim is deleted. If set to "Retain", the storage will
be retained when the PersistentVolumeClaim is deleted.
gateway-enabled:
type: boolean
default: false
description: |
Enable/Disable the gateway feature on the cluster.
actions:
get-kubeconfig:
Expand All @@ -169,6 +197,9 @@ actions:
server:
description: Override the server endpoint with this field
type: string
pre-upgrade-check:
description: Run necessary pre-upgrade checks before executing a charm upgrade.


parts:
charm:
Expand All @@ -180,21 +211,31 @@ peers:
interface: k8s-cluster
cos-tokens:
interface: cos-k8s-tokens
upgrade:
interface: upgrade

provides:
cos-agent:
interface: cos_agent
k8s-cluster:
interface: k8s-cluster
cos-worker-tokens:
interface: cos-k8s-tokens
containerd:
interface: containerd
ceph-k8s-info:
interface: kubernetes-info
k8s-cluster:
interface: k8s-cluster
kube-control:
interface: kube-control

requires:
aws:
interface: aws-integration
azure:
interface: azure-integration
etcd:
interface: etcd
external-cloud-provider:
interface: external_cloud_provider
gcp:
interface: gcp-integration
Loading

0 comments on commit 927f7f0

Please sign in to comment.