Compare commits
No commits in common. "main" and "chart-v0.1.4" have entirely different histories.
main
...
chart-v0.1
|
|
@ -1,2 +0,0 @@
|
|||
# wasmCloud operator maintainers
|
||||
* @wasmCloud/operator-maintainers
|
||||
|
|
@ -86,15 +86,6 @@ jobs:
|
|||
type=sha,prefix=
|
||||
type=semver,pattern={{version}}
|
||||
|
||||
- name: Extract metadata (tags, labels) for Docker
|
||||
id: meta_wolfi
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
type=sha,prefix=,suffix=-wolfi
|
||||
type=semver,pattern={{version}},suffix=-wolfi
|
||||
|
||||
- name: Load artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
|
|
@ -115,14 +106,3 @@ jobs:
|
|||
labels: ${{ steps.meta.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
build-args: "BIN_PATH=artifacts/wasmcloud-operator"
|
||||
|
||||
- name: Build and push Docker image (wolfi)
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
push: true
|
||||
context: .
|
||||
file: './Dockerfile.wolfi'
|
||||
tags: ${{ steps.meta_wolfi.outputs.tags }}
|
||||
labels: ${{ steps.meta_wolfi.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
build-args: "BIN_PATH=artifacts/wasmcloud-operator"
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ jobs:
|
|||
|
||||
# Used by helm chart-testing below
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5.6.0
|
||||
uses: actions/setup-python@v5.1.1
|
||||
with:
|
||||
python-version: '3.12.2'
|
||||
|
||||
- name: Set up chart-testing
|
||||
uses: helm/chart-testing-action@v2.7.0
|
||||
uses: helm/chart-testing-action@v2.6.1
|
||||
with:
|
||||
version: v3.10.1
|
||||
yamllint_version: 1.35.1
|
||||
|
|
@ -48,7 +48,7 @@ jobs:
|
|||
ct lint --config charts/wasmcloud-operator/ct.yaml
|
||||
|
||||
- name: Create kind cluster
|
||||
uses: helm/kind-action@v1.12.0
|
||||
uses: helm/kind-action@v1.10.0
|
||||
with:
|
||||
version: "v0.22.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
|
|
@ -17,16 +17,6 @@ version = "1.0.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "aead"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.7.8"
|
||||
|
|
@ -152,7 +142,7 @@ dependencies = [
|
|||
"futures",
|
||||
"http",
|
||||
"memchr",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"nuid 0.5.0",
|
||||
"once_cell",
|
||||
"rand",
|
||||
|
|
@ -411,17 +401,6 @@ dependencies = [
|
|||
"windows-targets 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cipher"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"inout",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.4.6"
|
||||
|
|
@ -567,39 +546,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
"rand_core",
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crypto_box"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "16182b4f39a82ec8a6851155cc4c0cda3065bb1db33651726a29e1951de0f009"
|
||||
dependencies = [
|
||||
"aead",
|
||||
"crypto_secretbox",
|
||||
"curve25519-dalek",
|
||||
"salsa20",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crypto_secretbox"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"
|
||||
dependencies = [
|
||||
"aead",
|
||||
"cipher",
|
||||
"generic-array",
|
||||
"poly1305",
|
||||
"salsa20",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctrlc"
|
||||
version = "3.4.1"
|
||||
|
|
@ -624,7 +573,6 @@ dependencies = [
|
|||
"platforms",
|
||||
"rustc_version",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -925,7 +873,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
|
|||
dependencies = [
|
||||
"typenum",
|
||||
"version_check",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -947,12 +894,6 @@ version = "0.28.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
|
||||
[[package]]
|
||||
name = "h2"
|
||||
version = "0.3.26"
|
||||
|
|
@ -974,9 +915,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "handlebars"
|
||||
version = "5.1.2"
|
||||
version = "5.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
|
||||
checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4"
|
||||
dependencies = [
|
||||
"log",
|
||||
"pest",
|
||||
|
|
@ -1037,9 +978,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
|||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.9"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
||||
checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
|
|
@ -1249,15 +1190,6 @@ dependencies = [
|
|||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inout"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.12"
|
||||
|
|
@ -1580,14 +1512,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.0.2"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
|
||||
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"wasi",
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1617,22 +1548,6 @@ dependencies = [
|
|||
"signatory",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nkeys"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2de02c883c178998da8d0c9816a88ef7ef5c58314dd1585c97a4a5679f3ab337"
|
||||
dependencies = [
|
||||
"crypto_box",
|
||||
"data-encoding",
|
||||
"ed25519",
|
||||
"ed25519-dalek",
|
||||
"getrandom",
|
||||
"log",
|
||||
"rand",
|
||||
"signatory",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "7.1.3"
|
||||
|
|
@ -1712,12 +1627,6 @@ dependencies = [
|
|||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
|
|
@ -1760,6 +1669,16 @@ dependencies = [
|
|||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.32.1"
|
||||
|
|
@ -1811,18 +1730,22 @@ version = "1.19.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "opaque-debug"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
|
||||
|
||||
[[package]]
|
||||
name = "openssl-probe"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
|
||||
[[package]]
|
||||
name = "opentelemetry"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
|
||||
dependencies = [
|
||||
"opentelemetry_api",
|
||||
"opentelemetry_sdk 0.20.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "opentelemetry"
|
||||
version = "0.21.0"
|
||||
|
|
@ -1841,17 +1764,17 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "opentelemetry-otlp"
|
||||
version = "0.14.0"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930"
|
||||
checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"futures-core",
|
||||
"http",
|
||||
"opentelemetry",
|
||||
"opentelemetry-proto",
|
||||
"opentelemetry-semantic-conventions",
|
||||
"opentelemetry_sdk",
|
||||
"opentelemetry_api",
|
||||
"opentelemetry_sdk 0.20.0",
|
||||
"prost",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
|
|
@ -1860,23 +1783,62 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "opentelemetry-proto"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1"
|
||||
checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
|
||||
dependencies = [
|
||||
"opentelemetry",
|
||||
"opentelemetry_sdk",
|
||||
"opentelemetry_api",
|
||||
"opentelemetry_sdk 0.20.0",
|
||||
"prost",
|
||||
"tonic",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "opentelemetry-semantic-conventions"
|
||||
version = "0.13.0"
|
||||
version = "0.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
|
||||
checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269"
|
||||
dependencies = [
|
||||
"opentelemetry",
|
||||
"opentelemetry 0.20.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "opentelemetry_api"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
"indexmap 1.9.3",
|
||||
"js-sys",
|
||||
"once_cell",
|
||||
"pin-project-lite",
|
||||
"thiserror",
|
||||
"urlencoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "opentelemetry_sdk"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"crossbeam-channel",
|
||||
"futures-channel",
|
||||
"futures-executor",
|
||||
"futures-util",
|
||||
"once_cell",
|
||||
"opentelemetry_api",
|
||||
"ordered-float 3.9.2",
|
||||
"percent-encoding",
|
||||
"rand",
|
||||
"regex",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1890,9 +1852,8 @@ dependencies = [
|
|||
"futures-channel",
|
||||
"futures-executor",
|
||||
"futures-util",
|
||||
"glob",
|
||||
"once_cell",
|
||||
"opentelemetry",
|
||||
"opentelemetry 0.21.0",
|
||||
"ordered-float 4.2.0",
|
||||
"percent-encoding",
|
||||
"rand",
|
||||
|
|
@ -1911,6 +1872,15 @@ dependencies = [
|
|||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordered-float"
|
||||
version = "3.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordered-float"
|
||||
version = "4.2.0"
|
||||
|
|
@ -2073,17 +2043,6 @@ version = "3.1.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
|
||||
|
||||
[[package]]
|
||||
name = "poly1305"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
|
||||
dependencies = [
|
||||
"cpufeatures",
|
||||
"opaque-debug",
|
||||
"universal-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "powerfmt"
|
||||
version = "0.2.0"
|
||||
|
|
@ -2439,15 +2398,6 @@ version = "1.0.15"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
|
||||
|
||||
[[package]]
|
||||
name = "salsa20"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
|
||||
dependencies = [
|
||||
"cipher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "schannel"
|
||||
version = "0.1.22"
|
||||
|
|
@ -2459,9 +2409,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "schemars"
|
||||
version = "0.8.22"
|
||||
version = "0.8.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
|
||||
checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
|
||||
dependencies = [
|
||||
"dyn-clone",
|
||||
"schemars_derive",
|
||||
|
|
@ -2471,14 +2421,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "schemars_derive"
|
||||
version = "0.8.22"
|
||||
version = "0.8.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
|
||||
checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"serde_derive_internals",
|
||||
"syn 2.0.38",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2541,9 +2491,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.193"
|
||||
version = "1.0.189"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
|
@ -2569,9 +2519,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.193"
|
||||
version = "1.0.189"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -2580,13 +2530,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_derive_internals"
|
||||
version = "0.29.0"
|
||||
version = "0.26.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
|
||||
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.38",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2644,9 +2594,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_yaml"
|
||||
version = "0.9.29"
|
||||
version = "0.9.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129"
|
||||
checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
|
||||
dependencies = [
|
||||
"indexmap 2.0.2",
|
||||
"itoa",
|
||||
|
|
@ -2893,13 +2843,12 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.36"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
|
|
@ -2914,11 +2863,10 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
|||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.18"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
|
|
@ -2939,20 +2887,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.42.1"
|
||||
version = "1.36.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2209a14885b74764cce87ffa777ffa1b8ce81a3f3166c6f886b83337fe7e077f"
|
||||
checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
"libc",
|
||||
"mio",
|
||||
"num_cpus",
|
||||
"parking_lot",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2 0.5.6",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2967,9 +2916,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "2.4.0"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
|
||||
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -3173,14 +3122,17 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-log"
|
||||
version = "0.2.0"
|
||||
name = "tracing-opentelemetry"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
|
||||
checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19"
|
||||
dependencies = [
|
||||
"log",
|
||||
"once_cell",
|
||||
"opentelemetry 0.20.0",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
"tracing-log",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3191,12 +3143,10 @@ checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
|
|||
dependencies = [
|
||||
"js-sys",
|
||||
"once_cell",
|
||||
"opentelemetry",
|
||||
"opentelemetry_sdk",
|
||||
"smallvec",
|
||||
"opentelemetry 0.21.0",
|
||||
"opentelemetry_sdk 0.21.2",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
"tracing-log 0.2.0",
|
||||
"tracing-subscriber",
|
||||
"web-time",
|
||||
]
|
||||
|
|
@ -3228,7 +3178,7 @@ dependencies = [
|
|||
"thread_local",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
"tracing-log 0.1.3",
|
||||
"tracing-log",
|
||||
"tracing-serde",
|
||||
]
|
||||
|
||||
|
|
@ -3302,16 +3252,6 @@ version = "0.2.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
|
||||
|
||||
[[package]]
|
||||
name = "universal-hash"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
|
||||
dependencies = [
|
||||
"crypto-common",
|
||||
"subtle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unsafe-libyaml"
|
||||
version = "0.2.11"
|
||||
|
|
@ -3381,9 +3321,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.12.1"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b"
|
||||
checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"serde",
|
||||
|
|
@ -3404,9 +3344,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
|||
|
||||
[[package]]
|
||||
name = "wadm"
|
||||
version = "0.13.0"
|
||||
version = "0.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40216dc6034c5e71bf773cea191e13581def996d21acf99fcc9347cc254b0490"
|
||||
checksum = "2d20c671aabb8fee1d7a688a81be4ebe14cbc4ae3a01db5dd62202ad39538fa5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-nats",
|
||||
|
|
@ -3419,7 +3359,7 @@ dependencies = [
|
|||
"indexmap 2.0.2",
|
||||
"jsonschema",
|
||||
"lazy_static",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"rand",
|
||||
"regex",
|
||||
"semver",
|
||||
|
|
@ -3435,20 +3375,19 @@ dependencies = [
|
|||
"uuid",
|
||||
"wadm-types",
|
||||
"wasmcloud-control-interface",
|
||||
"wasmcloud-secrets-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wadm-client"
|
||||
version = "0.2.0"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4aaf51fde61578275a9d7f19b7732219162c279dc76f02e2779a5e11beb33240"
|
||||
checksum = "422db00d06cf461d6410396dd5a2653bcf21bccb883659f39173756b91f3f477"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-nats",
|
||||
"bytes",
|
||||
"futures",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_yaml",
|
||||
|
|
@ -3461,9 +3400,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wadm-types"
|
||||
version = "0.2.0"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "00e7f30261740ec9da4d038cf719032d4bc00437b3e0252e258d0308d44fb576"
|
||||
checksum = "af535df65c0387b6a8ef521aca58a239af817f03ebf676f91e982b9b919bc513"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-nats",
|
||||
|
|
@ -3472,13 +3411,13 @@ dependencies = [
|
|||
"bytes",
|
||||
"chrono",
|
||||
"cloudevents-sdk",
|
||||
"futures",
|
||||
"indexmap 2.0.2",
|
||||
"jsonschema",
|
||||
"lazy_static",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"rand",
|
||||
"regex",
|
||||
"schemars",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -3489,10 +3428,8 @@ dependencies = [
|
|||
"tracing",
|
||||
"tracing-futures",
|
||||
"ulid",
|
||||
"utoipa",
|
||||
"uuid",
|
||||
"wasmcloud-control-interface",
|
||||
"wasmcloud-secrets-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3513,32 +3450,14 @@ dependencies = [
|
|||
"data-encoding",
|
||||
"humantime",
|
||||
"log",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"nuid 0.4.1",
|
||||
"ring 0.17.5",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"wasm-encoder 0.41.2",
|
||||
"wasm-encoder",
|
||||
"wasm-gen",
|
||||
"wasmparser 0.121.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wascap"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d394c2c59661bff13bea8bd7c8bf30618bafa671ef9f408ae9c3aa71ede5bb0"
|
||||
dependencies = [
|
||||
"data-encoding",
|
||||
"humantime",
|
||||
"nkeys 0.4.3",
|
||||
"nuid 0.4.1",
|
||||
"ring 0.17.5",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"wasm-encoder 0.208.1",
|
||||
"wasm-gen",
|
||||
"wasmparser 0.202.0",
|
||||
"wasmparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3622,15 +3541,6 @@ dependencies = [
|
|||
"leb128",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-encoder"
|
||||
version = "0.208.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6425e84e42f7f558478e40ecc2287912cb319f2ca68e5c0bb93c61d4fc63fa17"
|
||||
dependencies = [
|
||||
"leb128",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-gen"
|
||||
version = "0.1.4"
|
||||
|
|
@ -3667,13 +3577,13 @@ dependencies = [
|
|||
"cloudevents-sdk",
|
||||
"futures",
|
||||
"oci-distribution",
|
||||
"opentelemetry",
|
||||
"opentelemetry_sdk",
|
||||
"opentelemetry 0.21.0",
|
||||
"opentelemetry_sdk 0.21.2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-opentelemetry",
|
||||
"tracing-opentelemetry 0.22.0",
|
||||
"wasmcloud-core",
|
||||
]
|
||||
|
||||
|
|
@ -3689,7 +3599,7 @@ dependencies = [
|
|||
"bytes",
|
||||
"futures",
|
||||
"hex",
|
||||
"nkeys 0.3.2",
|
||||
"nkeys",
|
||||
"once_cell",
|
||||
"rustls 0.23.4",
|
||||
"serde",
|
||||
|
|
@ -3700,14 +3610,14 @@ dependencies = [
|
|||
"tracing",
|
||||
"ulid",
|
||||
"uuid",
|
||||
"wascap 0.13.0",
|
||||
"wascap",
|
||||
"wrpc-transport",
|
||||
"wrpc-transport-nats",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasmcloud-operator"
|
||||
version = "0.5.0"
|
||||
version = "0.3.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-nats",
|
||||
|
|
@ -3721,9 +3631,8 @@ dependencies = [
|
|||
"json-patch",
|
||||
"k8s-openapi",
|
||||
"kube",
|
||||
"opentelemetry",
|
||||
"opentelemetry 0.20.0",
|
||||
"opentelemetry-otlp",
|
||||
"opentelemetry_sdk",
|
||||
"rcgen",
|
||||
"schemars",
|
||||
"secrecy",
|
||||
|
|
@ -3735,7 +3644,7 @@ dependencies = [
|
|||
"tokio",
|
||||
"tokio-util",
|
||||
"tracing",
|
||||
"tracing-opentelemetry",
|
||||
"tracing-opentelemetry 0.20.0",
|
||||
"tracing-subscriber",
|
||||
"utoipa",
|
||||
"uuid",
|
||||
|
|
@ -3747,7 +3656,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasmcloud-operator-types"
|
||||
version = "0.1.9"
|
||||
version = "0.1.6"
|
||||
dependencies = [
|
||||
"k8s-openapi",
|
||||
"kube",
|
||||
|
|
@ -3756,22 +3665,6 @@ dependencies = [
|
|||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasmcloud-secrets-types"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e141cc3ac1fd9b71ec0813796e0a40767afea090d6395fa2b82abca9c882426"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"bytes",
|
||||
"nkeys 0.4.3",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
"wascap 0.15.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasmparser"
|
||||
version = "0.121.2"
|
||||
|
|
@ -3783,17 +3676,6 @@ dependencies = [
|
|||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasmparser"
|
||||
version = "0.202.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413"
|
||||
dependencies = [
|
||||
"bitflags 2.4.1",
|
||||
"indexmap 2.0.2",
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.64"
|
||||
|
|
|
|||
16
Cargo.toml
16
Cargo.toml
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "wasmcloud-operator"
|
||||
version = "0.5.0"
|
||||
version = "0.3.1"
|
||||
edition = "2021"
|
||||
|
||||
[[bin]]
|
||||
|
|
@ -34,7 +34,6 @@ json-patch = { workspace = true }
|
|||
k8s-openapi = { workspace = true, features = ["v1_28", "schemars"] }
|
||||
kube = { workspace = true, features = ["runtime", "derive", "default"] }
|
||||
opentelemetry = { workspace = true }
|
||||
opentelemetry_sdk = { workspace = true }
|
||||
opentelemetry-otlp = { workspace = true }
|
||||
rcgen = { workspace = true }
|
||||
schemars = { workspace = true }
|
||||
|
|
@ -72,13 +71,12 @@ handlebars = "5.1"
|
|||
json-patch = "1.4.0"
|
||||
k8s-openapi = { version = "0.20", default-features = false }
|
||||
kube = { version = "0.87", default-features = false }
|
||||
opentelemetry = { version = "0.21", default-features = false }
|
||||
opentelemetry_sdk = { version = "0.21", features = [
|
||||
opentelemetry = { version = "0.20", features = [
|
||||
"metrics",
|
||||
"trace",
|
||||
"rt-tokio",
|
||||
] }
|
||||
opentelemetry-otlp = { version = "0.14", features = ["tokio"] }
|
||||
opentelemetry-otlp = { version = "0.13", features = ["tokio"] }
|
||||
rcgen = "0.11"
|
||||
schemars = "0.8"
|
||||
secrecy = "0.8"
|
||||
|
|
@ -90,13 +88,13 @@ time = "0.3"
|
|||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-util = { version = "0.7", features = ["rt"] }
|
||||
tracing = "0.1"
|
||||
tracing-opentelemetry = "0.22"
|
||||
tracing-opentelemetry = "0.20"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||
utoipa = { version = "4.1", features = ["axum_extras"] }
|
||||
uuid = { version = "1", features = ["v5"] }
|
||||
wadm = "0.13.0"
|
||||
wadm-client = "0.2.0"
|
||||
wadm-types = "0.2.0"
|
||||
wadm = "0.12.2"
|
||||
wadm-client = "0.1.2"
|
||||
wadm-types = "0.1.0"
|
||||
wasmcloud-operator-types = { version = "*", path = "./crates/types" }
|
||||
|
||||
[workspace]
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
# syntax=docker/dockerfile:1
|
||||
FROM chainguard/wolfi-base:latest
|
||||
ARG BIN_PATH
|
||||
ARG TARGETARCH
|
||||
|
||||
COPY ${BIN_PATH}-${TARGETARCH} /usr/local/bin/wasmcloud-operator
|
||||
ENTRYPOINT ["/usr/local/bin/wasmcloud-operator"]
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# MAINTAINERS
|
||||
|
||||
The following individuals are responsible for reviewing code, managing issues, and ensuring the overall quality of `wasmcloud-operator`.
|
||||
|
||||
## @wasmCloud/operator-maintainers
|
||||
|
||||
Name: Joonas Bergius
|
||||
GitHub: @joonas
|
||||
Organization: Cosmonic
|
||||
|
||||
Name: Dan Norris
|
||||
GitHub: @protochron
|
||||
Organization: Cosmonic
|
||||
|
||||
Name: Taylor Thomas
|
||||
GitHub: @thomastaylor312
|
||||
Organization: Cosmonic
|
||||
|
||||
Name: Lucas Fontes
|
||||
GitHub: @lxfontes
|
||||
Organization: Cosmonic
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Reporting a security issue
|
||||
|
||||
Please refer to the [wasmCloud Security Process and Policy](https://github.com/wasmCloud/wasmCloud/blob/main/SECURITY.md) for details on how to report security issues and vulnerabilities.
|
||||
|
|
@ -7,10 +7,10 @@ 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: 0.1.6
|
||||
version: 0.1.4
|
||||
|
||||
# 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: "0.4.0"
|
||||
appVersion: "0.3.2"
|
||||
|
|
|
|||
|
|
@ -43,15 +43,10 @@ Common labels
|
|||
{{- define "wasmcloud-operator.labels" -}}
|
||||
helm.sh/chart: {{ include "wasmcloud-operator.chart" . }}
|
||||
{{ include "wasmcloud-operator.selectorLabels" . }}
|
||||
app.kubernetes.io/component: operator
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
app.kubernetes.io/part-of: wasmcloud-operator
|
||||
{{- with .Values.additionalLabels }}
|
||||
{{ . | toYaml }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
|
|
|
|||
|
|
@ -12,9 +12,6 @@ imagePullSecrets: []
|
|||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
|
||||
additionalLabels: {}
|
||||
# app: wasmcloud-operator
|
||||
|
||||
serviceAccount:
|
||||
# Specifies whether a service account should be created
|
||||
create: true
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
[package]
|
||||
name = "wasmcloud-operator-types"
|
||||
version = "0.1.9"
|
||||
version = "0.1.6"
|
||||
edition = "2021"
|
||||
|
||||
[package.metadata.cargo-machete]
|
||||
# NOTE: This exists because kube-derive needs it, and for reasons I don't
|
||||
# fully understand, it's not coming through kube-derive's own depedendencies.
|
||||
ignored = ["serde_json"]
|
||||
|
||||
[dependencies]
|
||||
k8s-openapi = {workspace = true}
|
||||
kube = {workspace = true, features = ["derive"]}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use k8s_openapi::api::core::v1::{Container, PodSpec, ResourceRequirements, Volume};
|
||||
use k8s_openapi::api::core::v1::{PodSpec, ResourceRequirements, Volume};
|
||||
use kube::CustomResource;
|
||||
use schemars::{gen::SchemaGenerator, schema::Schema, JsonSchema};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
@ -80,10 +80,6 @@ pub struct WasmCloudHostConfigSpec {
|
|||
pub observability: Option<ObservabilityConfiguration>,
|
||||
/// Certificates: Authorities, client certificates
|
||||
pub certificates: Option<WasmCloudHostCertificates>,
|
||||
/// wasmCloud secrets topic prefix, must not be empty if set.
|
||||
pub secrets_topic_prefix: Option<String>,
|
||||
/// Maximum memory in bytes that components can use.
|
||||
pub max_linear_memory_bytes: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
|
||||
|
|
@ -104,23 +100,9 @@ pub struct KubernetesSchedulingOptions {
|
|||
/// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for valid
|
||||
/// values to use here.
|
||||
pub resources: Option<WasmCloudHostConfigResources>,
|
||||
/// Any other pod template spec options to set for the underlying wasmCloud host pods.
|
||||
#[schemars(schema_with = "pod_schema")]
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
/// Any other pod template spec options to set for the underlying wasmCloud host pods.
|
||||
pub pod_template_additions: Option<PodSpec>,
|
||||
/// Allow for customization of either the wasmcloud or nats leaf container inside of the wasmCloud host pod.
|
||||
pub container_template_additions: Option<ContainerTemplateAdditions>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ContainerTemplateAdditions {
|
||||
#[schemars(schema_with = "container_schema")]
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub nats: Option<Container>,
|
||||
#[schemars(schema_with = "container_schema")]
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub wasmcloud: Option<Container>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
|
||||
|
|
@ -179,24 +161,6 @@ fn pod_schema(_gen: &mut SchemaGenerator) -> Schema {
|
|||
val.schema.into()
|
||||
}
|
||||
|
||||
/// This is a workaround for the fact that we can't override the Container schema to make name
|
||||
/// an optional field. It generates the OpenAPI schema for the Container type the same way that
|
||||
/// kube.rs does while dropping any required fields.
|
||||
fn container_schema(_gen: &mut SchemaGenerator) -> Schema {
|
||||
let gen = schemars::gen::SchemaSettings::openapi3()
|
||||
.with(|s| {
|
||||
s.inline_subschemas = true;
|
||||
s.meta_schema = None;
|
||||
})
|
||||
.with_visitor(kube::core::schema::StructuralSchemaRewriter)
|
||||
.into_generator();
|
||||
let mut val = gen.into_root_schema_for::<Container>();
|
||||
// Drop `name` as a required field as it will be filled in from container
|
||||
// definition coming the controller that this configuration gets merged into.
|
||||
val.schema.object.as_mut().unwrap().required = BTreeSet::new();
|
||||
val.schema.into()
|
||||
}
|
||||
|
||||
fn default_host_replicas() -> u32 {
|
||||
1
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ spec:
|
|||
spec:
|
||||
serviceAccountName: wasmcloud-operator
|
||||
containers:
|
||||
- image: ghcr.io/wasmcloud/wasmcloud-operator:0.5.0
|
||||
- image: ghcr.io/wasmcloud/wasmcloud-operator:0.3.2
|
||||
imagePullPolicy: Always
|
||||
name: wasmcloud-operator
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -68,11 +68,6 @@ spec:
|
|||
traces:
|
||||
enable: false
|
||||
endpoint: "traces-specific-otel-collector.svc"
|
||||
# Optional: Subject prefix that will be used by the host to query for wasmCloud Secrets.
|
||||
# See https://wasmcloud.com/docs/concepts/secrets for more context
|
||||
secretsTopicPrefix: "wasmcloud.secrets"
|
||||
# Optional: The maximum amount of memory bytes that a component can allocate.
|
||||
maxLinearMemoryBytes: 20000000
|
||||
# Optional: Additional options to control how the underlying wasmCloud hosts are scheduled in Kubernetes.
|
||||
# This includes setting resource requirements for the nats and wasmCloud host
|
||||
# containers along with any additional pot template settings.
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ spec:
|
|||
image: ghcr.io/wasmcloud/components/http-hello-world-rust:0.1.0
|
||||
traits:
|
||||
# Govern the spread/scheduling of the component
|
||||
- type: daemonscaler
|
||||
- type: spreadscaler
|
||||
properties:
|
||||
replicas: 100
|
||||
replicas: 1
|
||||
|
||||
# Add a capability provider that enables HTTP access
|
||||
- name: httpserver
|
||||
|
|
@ -30,11 +30,9 @@ spec:
|
|||
image: ghcr.io/wasmcloud/http-server:0.21.0
|
||||
traits:
|
||||
# Establish a unidirectional link from this http server provider (the "source")
|
||||
# to the `http-component` component (the "target") so the component can handle incoming HTTP requests.
|
||||
# to the `http-component` component (the "target") so the component can handle incoming HTTP requests,
|
||||
#
|
||||
# The source (this provider) is configured such that the HTTP server listens on 0.0.0.0:8000.
|
||||
# When running the application on Kubernetes with the wasmCloud operator, you can change the
|
||||
# port but the address must be 0.0.0.0.
|
||||
# The source (this provider) is configured such that the HTTP server listens on 127.0.0.1:8080
|
||||
- type: link
|
||||
properties:
|
||||
target: http-component
|
||||
|
|
@ -44,10 +42,4 @@ spec:
|
|||
source_config:
|
||||
- name: default-http
|
||||
properties:
|
||||
address: 0.0.0.0:8000
|
||||
# When running the application on Kubernetes with the wasmCloud operator,
|
||||
# the operator automatically creates a Kubernetes service for applications that use
|
||||
# the httpserver provider with a daemonscaler.
|
||||
- type: daemonscaler
|
||||
properties:
|
||||
replicas: 1
|
||||
address: 127.0.0.1:8080
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ use k8s_openapi::api::core::v1::{
|
|||
};
|
||||
use k8s_openapi::api::rbac::v1::{PolicyRule, Role, RoleBinding, RoleRef, Subject};
|
||||
use k8s_openapi::apimachinery::pkg::apis::meta::v1::LabelSelector;
|
||||
use k8s_openapi::DeepMerge;
|
||||
use kube::{
|
||||
api::{Api, ObjectMeta, Patch, PatchParams},
|
||||
client::Client as KubeClient,
|
||||
|
|
@ -374,34 +373,15 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result
|
|||
}
|
||||
}
|
||||
|
||||
if let Some(secrets_prefix) = &config.spec.secrets_topic_prefix {
|
||||
wasmcloud_env.push(EnvVar {
|
||||
name: "WASMCLOUD_SECRETS_TOPIC".to_string(),
|
||||
value: Some(secrets_prefix.clone()),
|
||||
..Default::default()
|
||||
})
|
||||
}
|
||||
|
||||
if let Some(max_linear_memory_bytes) = &config.spec.max_linear_memory_bytes {
|
||||
wasmcloud_env.push(EnvVar {
|
||||
name: "WASMCLOUD_MAX_LINEAR_MEMORY".to_string(),
|
||||
value: Some(max_linear_memory_bytes.to_string()),
|
||||
..Default::default()
|
||||
})
|
||||
}
|
||||
|
||||
let mut wasmcloud_args = configure_observability(&config.spec);
|
||||
|
||||
let mut nats_resources: Option<k8s_openapi::api::core::v1::ResourceRequirements> = None;
|
||||
let mut wasmcloud_resources: Option<k8s_openapi::api::core::v1::ResourceRequirements> = None;
|
||||
if let Some(resources) = &config
|
||||
.spec
|
||||
.scheduling_options
|
||||
.as_ref()
|
||||
.and_then(|so| so.resources.clone())
|
||||
{
|
||||
nats_resources.clone_from(&resources.nats);
|
||||
wasmcloud_resources.clone_from(&resources.wasmcloud);
|
||||
if let Some(scheduling_options) = &config.spec.scheduling_options {
|
||||
if let Some(resources) = &scheduling_options.resources {
|
||||
nats_resources = resources.nats.clone();
|
||||
wasmcloud_resources = resources.wasmcloud.clone();
|
||||
}
|
||||
}
|
||||
|
||||
let image = match &config.spec.image {
|
||||
|
|
@ -547,7 +527,7 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result
|
|||
});
|
||||
}
|
||||
|
||||
let mut containers = vec![
|
||||
let containers = vec![
|
||||
Container {
|
||||
name: "nats-leaf".to_string(),
|
||||
image: Some(leaf_image),
|
||||
|
|
@ -587,22 +567,6 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result
|
|||
},
|
||||
];
|
||||
|
||||
if let Some(cta) = &config
|
||||
.spec
|
||||
.scheduling_options
|
||||
.as_ref()
|
||||
.and_then(|so| so.container_template_additions.clone())
|
||||
{
|
||||
if let Some(mut nats_container) = cta.nats.clone() {
|
||||
nats_container.merge_from(containers[0].clone());
|
||||
containers[0] = nats_container;
|
||||
}
|
||||
if let Some(mut wasmcloud_container) = cta.wasmcloud.clone() {
|
||||
wasmcloud_container.merge_from(containers[1].clone());
|
||||
containers[1] = wasmcloud_container;
|
||||
}
|
||||
}
|
||||
|
||||
let service_account = config.name_any();
|
||||
let mut template = PodTemplateSpec {
|
||||
metadata: Some(ObjectMeta {
|
||||
|
|
@ -617,20 +581,17 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result
|
|||
}),
|
||||
};
|
||||
|
||||
if let Some(pod_overrides) = &config
|
||||
.spec
|
||||
.scheduling_options
|
||||
.as_ref()
|
||||
.and_then(|so| so.pod_template_additions.clone())
|
||||
{
|
||||
if let Some(scheduling_options) = &config.spec.scheduling_options {
|
||||
if let Some(pod_overrides) = &scheduling_options.pod_template_additions {
|
||||
let mut overrides = pod_overrides.clone();
|
||||
overrides.service_account_name = Some(service_account);
|
||||
overrides.containers.clone_from(&containers);
|
||||
overrides.containers = containers.clone();
|
||||
if let Some(vols) = overrides.volumes {
|
||||
volumes.extend(vols);
|
||||
}
|
||||
overrides.volumes = Some(volumes);
|
||||
template.spec = Some(overrides);
|
||||
}
|
||||
};
|
||||
Ok(template)
|
||||
}
|
||||
|
|
@ -847,12 +808,8 @@ async fn configure_hosts(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Res
|
|||
];
|
||||
}
|
||||
|
||||
if config
|
||||
.spec
|
||||
.scheduling_options
|
||||
.as_ref()
|
||||
.is_some_and(|so| so.daemonset)
|
||||
{
|
||||
if let Some(scheduling_options) = &config.spec.scheduling_options {
|
||||
if scheduling_options.daemonset {
|
||||
let mut spec = daemonset_spec(config, ctx.clone()).await?;
|
||||
spec.template.spec.as_mut().unwrap().containers[1]
|
||||
.env
|
||||
|
|
@ -871,13 +828,15 @@ async fn configure_hosts(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Res
|
|||
..Default::default()
|
||||
};
|
||||
|
||||
let api = Api::<DaemonSet>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
|
||||
let api =
|
||||
Api::<DaemonSet>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
|
||||
api.patch(
|
||||
&config.name_any(),
|
||||
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
|
||||
&Patch::Apply(ds),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
} else {
|
||||
let mut spec = deployment_spec(config, ctx.clone()).await?;
|
||||
spec.template.spec.as_mut().unwrap().containers[1]
|
||||
|
|
|
|||
22
src/main.rs
22
src/main.rs
|
|
@ -13,10 +13,9 @@ use kube::{
|
|||
client::Client,
|
||||
CustomResourceExt,
|
||||
};
|
||||
use opentelemetry::KeyValue;
|
||||
use opentelemetry_sdk::{
|
||||
trace::{RandomIdGenerator, Sampler},
|
||||
Resource,
|
||||
use opentelemetry::sdk::{
|
||||
trace::{self, RandomIdGenerator, Sampler},
|
||||
Resource as OTELResource,
|
||||
};
|
||||
use std::io::IsTerminal;
|
||||
use std::net::SocketAddr;
|
||||
|
|
@ -28,13 +27,6 @@ use wasmcloud_operator_types::v1alpha1::WasmCloudHostConfig;
|
|||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<()> {
|
||||
let args = std::env::args().collect::<Vec<_>>();
|
||||
if args.iter().any(|arg| arg == "-V" || arg == "--version") {
|
||||
let version = version();
|
||||
println!("{} {version}", env!("CARGO_BIN_NAME"));
|
||||
std::process::exit(0);
|
||||
}
|
||||
|
||||
let tracing_enabled = std::env::var("OTEL_EXPORTER_OTLP_ENDPOINT").is_ok();
|
||||
configure_tracing(tracing_enabled).map_err(|e| {
|
||||
error!("Failed to configure tracing: {}", e);
|
||||
|
|
@ -88,12 +80,12 @@ fn configure_tracing(enabled: bool) -> anyhow::Result<()> {
|
|||
.tracing()
|
||||
.with_exporter(opentelemetry_otlp::new_exporter().tonic())
|
||||
.with_trace_config(
|
||||
opentelemetry_sdk::trace::config()
|
||||
trace::config()
|
||||
.with_sampler(Sampler::AlwaysOn)
|
||||
.with_id_generator(RandomIdGenerator::default())
|
||||
.with_max_attributes_per_span(32)
|
||||
.with_max_events_per_span(32)
|
||||
.with_resource(Resource::new(vec![KeyValue::new(
|
||||
.with_resource(OTELResource::new(vec![opentelemetry::KeyValue::new(
|
||||
"service.name",
|
||||
"wasmcloud-operator",
|
||||
)])),
|
||||
|
|
@ -199,7 +191,3 @@ async fn install_crd(client: &Client) -> anyhow::Result<()> {
|
|||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn version() -> &'static str {
|
||||
option_env!("CARGO_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION"))
|
||||
}
|
||||
|
|
|
|||
489
src/openapi.rs
489
src/openapi.rs
|
|
@ -53,25 +53,6 @@ pub struct Metadata {
|
|||
pub struct Specification {
|
||||
/// The list of components for describing an application
|
||||
pub components: Vec<Component>,
|
||||
|
||||
/// The list of policies describing an application. This is for providing application-wide
|
||||
/// setting such as configuration for a secrets backend, how to render Kubernetes services,
|
||||
/// etc. It can be omitted if no policies are needed for an application.
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
pub policies: Vec<Policy>,
|
||||
}
|
||||
|
||||
/// A policy definition
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, ToSchema)]
|
||||
#[schema(as = dev::oam::core::v1beta1::Policy)]
|
||||
pub struct Policy {
|
||||
/// The name of this policy
|
||||
pub name: String,
|
||||
/// The properties for this policy
|
||||
pub properties: BTreeMap<String, String>,
|
||||
/// The type of the policy
|
||||
#[serde(rename = "type")]
|
||||
pub policy_type: String,
|
||||
}
|
||||
|
||||
/// A component definition
|
||||
|
|
@ -197,20 +178,19 @@ pub struct Spread {
|
|||
#[derive(OpenApi)]
|
||||
#[openapi(
|
||||
components(schemas(
|
||||
ActorProperties,
|
||||
Application,
|
||||
CapabilityConfig,
|
||||
CapabilityProperties,
|
||||
Component,
|
||||
LinkdefProperty,
|
||||
Metadata,
|
||||
Policy,
|
||||
Properties,
|
||||
Specification,
|
||||
Spread,
|
||||
SpreadScalerProperty,
|
||||
Component,
|
||||
Properties,
|
||||
ActorProperties,
|
||||
CapabilityProperties,
|
||||
CapabilityConfig,
|
||||
Trait,
|
||||
TraitProperty,
|
||||
LinkdefProperty,
|
||||
SpreadScalerProperty,
|
||||
Spread,
|
||||
)),
|
||||
info(
|
||||
description = "The OAM Application API provides a way to manage applications in a Kubernetes cluster."
|
||||
|
|
@ -286,41 +266,40 @@ async fn openapi_v2() -> impl IntoResponse {
|
|||
|
||||
const OPENAPI_V2_SPEC_JSON: &str = r##"
|
||||
{
|
||||
"swagger": "2.0",
|
||||
"info": {
|
||||
"title": "wasmcloud-operator",
|
||||
"description": "The OAM Application API provides a way to manage applications in a Kubernetes cluster.",
|
||||
"license": {
|
||||
"name": "Apache 2.0"
|
||||
"name": ""
|
||||
},
|
||||
"version": "0.4.0"
|
||||
"version": "0.1.6"
|
||||
},
|
||||
"paths": {
|
||||
"/apis/core.oam.dev/v1beta1": {
|
||||
"get": {
|
||||
"parameters": [],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::router"
|
||||
],
|
||||
"operationId": "api_resources"
|
||||
"operationId": "api_resources",
|
||||
"responses": {},
|
||||
"parameters": []
|
||||
}
|
||||
},
|
||||
"/apis/core.oam.dev/v1beta1/namespaces/{namespace}/applications": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "list_applications",
|
||||
"parameters": [
|
||||
{
|
||||
"in": "path",
|
||||
"name": "namespace",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "list_applications",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -330,18 +309,22 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"post": {
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "create_application",
|
||||
"parameters": [
|
||||
{
|
||||
"in": "path",
|
||||
"name": "namespace",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"description": "",
|
||||
"in": "body",
|
||||
"name": "body",
|
||||
"required": true,
|
||||
"name": "body",
|
||||
"in": "body",
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"format": "binary"
|
||||
|
|
@ -349,10 +332,6 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "create_application",
|
||||
"consumes": [
|
||||
"application/octet-stream"
|
||||
],
|
||||
|
|
@ -366,26 +345,26 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
},
|
||||
"/apis/core.oam.dev/v1beta1/namespaces/{namespace}/applications/{name}": {
|
||||
"delete": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "get_application",
|
||||
"parameters": [
|
||||
{
|
||||
"in": "path",
|
||||
"name": "namespace",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"in": "path",
|
||||
"name": "name",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "delete_application",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -394,26 +373,26 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
]
|
||||
},
|
||||
"get": {
|
||||
"delete": {
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "delete_application",
|
||||
"parameters": [
|
||||
{
|
||||
"in": "path",
|
||||
"name": "namespace",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"in": "path",
|
||||
"name": "name",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "get_application",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -423,24 +402,28 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"patch": {
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "patch_application",
|
||||
"parameters": [
|
||||
{
|
||||
"in": "path",
|
||||
"name": "namespace",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"in": "path",
|
||||
"name": "name",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"description": "",
|
||||
"in": "body",
|
||||
"name": "body",
|
||||
"required": true,
|
||||
"name": "body",
|
||||
"in": "body",
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"format": "binary"
|
||||
|
|
@ -448,10 +431,6 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
],
|
||||
"responses": {},
|
||||
"tags": [
|
||||
"crate::resources::application"
|
||||
],
|
||||
"operationId": "patch_application",
|
||||
"consumes": [
|
||||
"application/octet-stream"
|
||||
],
|
||||
|
|
@ -465,18 +444,19 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
}
|
||||
},
|
||||
"swagger": "2.0",
|
||||
"definitions": {
|
||||
"dev.oam.core.v1beta1.ActorProperties": {
|
||||
"properties": {
|
||||
"image": {
|
||||
"description": "The image reference to use",
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"required": [
|
||||
"image"
|
||||
],
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"image": {
|
||||
"type": "string",
|
||||
"description": "The image reference to use"
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -486,15 +466,22 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Application": {
|
||||
"type": "object",
|
||||
"description": "An OAM manifest",
|
||||
"required": [
|
||||
"apiVersion",
|
||||
"kind",
|
||||
"metadata",
|
||||
"spec"
|
||||
],
|
||||
"properties": {
|
||||
"apiVersion": {
|
||||
"description": "The OAM version of the manifest",
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"description": "The OAM version of the manifest"
|
||||
},
|
||||
"kind": {
|
||||
"description": "The kind or type of manifest described by the spec",
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"description": "The kind or type of manifest described by the spec"
|
||||
},
|
||||
"metadata": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Metadata"
|
||||
|
|
@ -503,13 +490,6 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
"$ref": "#/definitions/dev.oam.core.v1beta1.Specification"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"apiVersion",
|
||||
"kind",
|
||||
"metadata",
|
||||
"spec"
|
||||
],
|
||||
"type": "object",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -520,28 +500,6 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
},
|
||||
"dev.oam.core.v1beta1.CapabilityConfig": {
|
||||
"description": "Right now providers can technically use any config format they want, although most use JSON.\nThis enum takes that into account and allows either type of data to be passed",
|
||||
"oneOf": [
|
||||
{
|
||||
"properties": {
|
||||
"Json": {}
|
||||
},
|
||||
"required": [
|
||||
"Json"
|
||||
],
|
||||
"type": "object"
|
||||
},
|
||||
{
|
||||
"properties": {
|
||||
"Opaque": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"Opaque"
|
||||
],
|
||||
"type": "object"
|
||||
}
|
||||
],
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -551,6 +509,11 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.CapabilityProperties": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"image",
|
||||
"contract"
|
||||
],
|
||||
"properties": {
|
||||
"config": {
|
||||
"allOf": [
|
||||
|
|
@ -558,27 +521,22 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
"$ref": "#/definitions/dev.oam.core.v1beta1.CapabilityConfig"
|
||||
}
|
||||
],
|
||||
"nullable": true
|
||||
"x-nullable": true
|
||||
},
|
||||
"contract": {
|
||||
"description": "The contract ID of this capability",
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"description": "The contract ID of this capability"
|
||||
},
|
||||
"image": {
|
||||
"description": "The image reference to use",
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"description": "The image reference to use"
|
||||
},
|
||||
"link_name": {
|
||||
"type": "string",
|
||||
"description": "An optional link name to use for this capability",
|
||||
"nullable": true,
|
||||
"type": "string"
|
||||
"x-nullable": true
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"image",
|
||||
"contract"
|
||||
],
|
||||
"type": "object",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -593,24 +551,24 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
"$ref": "#/definitions/dev.oam.core.v1beta1.Properties"
|
||||
},
|
||||
{
|
||||
"properties": {
|
||||
"name": {
|
||||
"description": "The name of this component",
|
||||
"type": "string"
|
||||
},
|
||||
"traits": {
|
||||
"description": "A list of various traits assigned to this component",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Trait"
|
||||
},
|
||||
"nullable": true,
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"type": "object",
|
||||
"required": [
|
||||
"name"
|
||||
],
|
||||
"type": "object"
|
||||
"properties": {
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "The name of this component"
|
||||
},
|
||||
"traits": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Trait"
|
||||
},
|
||||
"description": "A list of various traits assigned to this component",
|
||||
"x-nullable": true
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"description": "A component definition",
|
||||
|
|
@ -623,25 +581,25 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.LinkdefProperty": {
|
||||
"type": "object",
|
||||
"description": "Properties for linkdefs",
|
||||
"properties": {
|
||||
"target": {
|
||||
"description": "The target this linkdef applies to. This should be the name of an actor component",
|
||||
"type": "string"
|
||||
},
|
||||
"values": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "Values to use for this linkdef",
|
||||
"nullable": true,
|
||||
"type": "object"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"target"
|
||||
],
|
||||
"properties": {
|
||||
"target": {
|
||||
"type": "string",
|
||||
"description": "The target this linkdef applies to. This should be the name of an actor component"
|
||||
},
|
||||
"values": {
|
||||
"type": "object",
|
||||
"description": "Values to use for this linkdef",
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"x-nullable": true
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -651,35 +609,35 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Metadata": {
|
||||
"type": "object",
|
||||
"description": "The metadata describing the manifest",
|
||||
"required": [
|
||||
"name"
|
||||
],
|
||||
"properties": {
|
||||
"annotations": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "object",
|
||||
"description": "Optional data for annotating this manifest",
|
||||
"type": "object"
|
||||
},
|
||||
"labels": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "object"
|
||||
},
|
||||
"name": {
|
||||
"description": "The name of the manifest. This should be unique",
|
||||
"type": "string"
|
||||
},
|
||||
"namespace": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"name",
|
||||
"namespace",
|
||||
"labels"
|
||||
],
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "The name of the manifest. This should be unique"
|
||||
},
|
||||
"namespace": {
|
||||
"type": "string",
|
||||
"description": "The namespace for the application."
|
||||
},
|
||||
"labels": {
|
||||
"type": "object",
|
||||
"description": "Optional data for labeling this manifest",
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -688,82 +646,8 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
}
|
||||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Policy": {
|
||||
"description": "A policy definition",
|
||||
"properties": {
|
||||
"name": {
|
||||
"description": "The name of this policy",
|
||||
"type": "string"
|
||||
},
|
||||
"properties": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "The properties for this policy",
|
||||
"type": "object"
|
||||
},
|
||||
"type": {
|
||||
"description": "The type of the policy",
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"name",
|
||||
"properties",
|
||||
"type"
|
||||
],
|
||||
"type": "object",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
"kind": "Policy",
|
||||
"version": "v1beta1"
|
||||
}
|
||||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Properties": {
|
||||
"description": "Properties that can be defined for a component",
|
||||
"discriminator": {
|
||||
"propertyName": "type"
|
||||
},
|
||||
"oneOf": [
|
||||
{
|
||||
"properties": {
|
||||
"properties": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.ActorProperties"
|
||||
},
|
||||
"type": {
|
||||
"enum": [
|
||||
"actor"
|
||||
],
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"properties",
|
||||
"type"
|
||||
],
|
||||
"type": "object"
|
||||
},
|
||||
{
|
||||
"properties": {
|
||||
"properties": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.CapabilityProperties"
|
||||
},
|
||||
"type": {
|
||||
"enum": [
|
||||
"capability"
|
||||
],
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"properties",
|
||||
"type"
|
||||
],
|
||||
"type": "object"
|
||||
}
|
||||
],
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -773,27 +657,20 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Specification": {
|
||||
"type": "object",
|
||||
"description": "A representation of an OAM specification",
|
||||
"properties": {
|
||||
"components": {
|
||||
"description": "The list of components for describing an application",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Component"
|
||||
},
|
||||
"type": "array"
|
||||
},
|
||||
"policies": {
|
||||
"description": "The list of policies describing an application. This is for providing application-wide\nsetting such as configuration for a secrets backend, how to render Kubernetes services,\netc. It can be omitted if no policies are needed for an application.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Policy"
|
||||
},
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"components"
|
||||
],
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"components": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Component"
|
||||
},
|
||||
"description": "The list of components for describing an application"
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -803,30 +680,30 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Spread": {
|
||||
"type": "object",
|
||||
"description": "Configuration for various spreading requirements",
|
||||
"properties": {
|
||||
"name": {
|
||||
"description": "The name of this spread requirement",
|
||||
"type": "string"
|
||||
},
|
||||
"requirements": {
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
},
|
||||
"description": "An arbitrary map of labels to match on for scaling requirements",
|
||||
"type": "object"
|
||||
},
|
||||
"weight": {
|
||||
"description": "An optional weight for this spread. Higher weights are given more precedence",
|
||||
"minimum": 0,
|
||||
"nullable": true,
|
||||
"type": "integer"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"name"
|
||||
],
|
||||
"properties": {
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "The name of this spread requirement"
|
||||
},
|
||||
"requirements": {
|
||||
"type": "object",
|
||||
"description": "An arbitrary map of labels to match on for scaling requirements",
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"weight": {
|
||||
"type": "integer",
|
||||
"description": "An optional weight for this spread. Higher weights are given more precedence",
|
||||
"minimum": 0,
|
||||
"x-nullable": true
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -836,25 +713,25 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.SpreadScalerProperty": {
|
||||
"type": "object",
|
||||
"description": "Properties for spread scalers",
|
||||
"properties": {
|
||||
"replicas": {
|
||||
"description": "Number of replicas to scale",
|
||||
"minimum": 0,
|
||||
"type": "integer"
|
||||
},
|
||||
"spread": {
|
||||
"description": "Requirements for spreading throse replicas",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Spread"
|
||||
},
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"replicas"
|
||||
],
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"replicas": {
|
||||
"type": "integer",
|
||||
"description": "Number of replicas to scale",
|
||||
"minimum": 0
|
||||
},
|
||||
"spread": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.Spread"
|
||||
},
|
||||
"description": "Requirements for spreading throse replicas"
|
||||
}
|
||||
},
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -864,20 +741,20 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
]
|
||||
},
|
||||
"dev.oam.core.v1beta1.Trait": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"type",
|
||||
"properties"
|
||||
],
|
||||
"properties": {
|
||||
"properties": {
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.TraitProperty"
|
||||
},
|
||||
"type": {
|
||||
"description": "The type of trait specified. This should be a unique string for the type of scaler. As we\nplan on supporting custom scalers, these traits are not enumerated",
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"description": "The type of trait specified. This should be a unique string for the type of scaler. As we\nplan on supporting custom scalers, these traits are not enumerated"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"type",
|
||||
"properties"
|
||||
],
|
||||
"type": "object",
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -888,15 +765,6 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
},
|
||||
"dev.oam.core.v1beta1.TraitProperty": {
|
||||
"description": "Properties for defining traits",
|
||||
"oneOf": [
|
||||
{
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.LinkdefProperty"
|
||||
},
|
||||
{
|
||||
"$ref": "#/definitions/dev.oam.core.v1beta1.SpreadScalerProperty"
|
||||
},
|
||||
{}
|
||||
],
|
||||
"x-kubernetes-group-version-kind": [
|
||||
{
|
||||
"group": "core.oam.dev",
|
||||
|
|
@ -908,5 +776,4 @@ const OPENAPI_V2_SPEC_JSON: &str = r##"
|
|||
},
|
||||
"x-components": {}
|
||||
}
|
||||
|
||||
"##;
|
||||
|
|
|
|||
|
|
@ -618,13 +618,13 @@ fn http_server_component(manifest: &Manifest) -> Option<HttpServerComponent> {
|
|||
if props.namespace == "wasi"
|
||||
&& props.package == "http"
|
||||
&& props.interfaces.contains(&"incoming-handler".to_string())
|
||||
&& props.source.is_some()
|
||||
{
|
||||
let source = props.source.as_ref().unwrap();
|
||||
for cp in source.config.iter() {
|
||||
if let Some(addr) = cp.properties.as_ref().and_then(|p| p.get("address")) {
|
||||
for p in props.source_config.iter() {
|
||||
if let Some(config_props) = &p.properties {
|
||||
if let Some(addr) = config_props.get("address") {
|
||||
details.address.clone_from(addr);
|
||||
should_create_service = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue