From 6ece7a963940a86e53eba8682ea240e4a7077418 Mon Sep 17 00:00:00 2001 From: liu-hm19 Date: Mon, 15 Jan 2024 15:28:47 +0800 Subject: [PATCH] feat: update wordpress samples (#152) --- .../dev => wordpress-cloud-rds/prod}/kcl.mod | 6 +-- example/wordpress-cloud-rds/prod/main.k | 38 ++++++++++++++++ .../prod}/stack.yaml | 2 +- .../project.yaml | 2 +- example/wordpress-local-db/prod/kcl.mod | 9 ++++ example/wordpress-local-db/prod/main.k | 34 +++++++++++++++ example/wordpress-local-db/prod/stack.yaml | 2 + example/wordpress-local-db/project.yaml | 4 ++ example/wordpress/dev/main.k | 43 ------------------- example/wordpress/dev/platform.k | 14 ------ 10 files changed, 92 insertions(+), 62 deletions(-) rename example/{wordpress/dev => wordpress-cloud-rds/prod}/kcl.mod (71%) create mode 100644 example/wordpress-cloud-rds/prod/main.k rename example/{wordpress/dev => wordpress-cloud-rds/prod}/stack.yaml (67%) rename example/{wordpress => wordpress-cloud-rds}/project.yaml (69%) create mode 100644 example/wordpress-local-db/prod/kcl.mod create mode 100644 example/wordpress-local-db/prod/main.k create mode 100644 example/wordpress-local-db/prod/stack.yaml create mode 100644 example/wordpress-local-db/project.yaml delete mode 100644 example/wordpress/dev/main.k delete mode 100644 example/wordpress/dev/platform.k diff --git a/example/wordpress/dev/kcl.mod b/example/wordpress-cloud-rds/prod/kcl.mod similarity index 71% rename from example/wordpress/dev/kcl.mod rename to example/wordpress-cloud-rds/prod/kcl.mod index ad573640..fec41e5a 100644 --- a/example/wordpress/dev/kcl.mod +++ b/example/wordpress-cloud-rds/prod/kcl.mod @@ -1,9 +1,9 @@ [package] -name = "wordpress" +name = "wordpress-cloud-rds" version = "0.1.0" [dependencies] catalog = { git = "https://github.com/KusionStack/catalog.git", tag = "0.1.2" } - [profile] -entries = ["main.k","platform.k"] +entries = ["main.k"] + diff --git a/example/wordpress-cloud-rds/prod/main.k b/example/wordpress-cloud-rds/prod/main.k new file mode 100644 index 00000000..116299c8 --- /dev/null +++ b/example/wordpress-cloud-rds/prod/main.k @@ -0,0 +1,38 @@ +import catalog.models.schema.v1 as ac +import catalog.models.schema.v1.workload as wl +import catalog.models.schema.v1.workload.container as c +import catalog.models.schema.v1.workload.network as n +import catalog.models.schema.v1.accessories.mysql + +# main.k declares customized configurations for prod stacks. +wordpress: ac.AppConfiguration { + workload: wl.Service { + containers: { + wordpress: c.Container { + image: "wordpress:6.3" + env: { + "WORDPRESS_DB_HOST": "$(KUSION_DB_HOST_WORDPRESS_MYSQL)" + "WORDPRESS_DB_USER": "$(KUSION_DB_USERNAME_WORDPRESS_MYSQL)" + "WORDPRESS_DB_PASSWORD": "$(KUSION_DB_PASSWORD_WORDPRESS_MYSQL)" + "WORDPRESS_DB_NAME": "mysql" + } + resources: { + "cpu": "500m" + "memory": "512Mi" + } + } + } + replicas: 1 + ports: [ + n.Port { + port: 80 + } + ] + } + database: { + wordpress: mysql.MySQL { + type: "cloud" + version: "8.0" + } + } +} diff --git a/example/wordpress/dev/stack.yaml b/example/wordpress-cloud-rds/prod/stack.yaml similarity index 67% rename from example/wordpress/dev/stack.yaml rename to example/wordpress-cloud-rds/prod/stack.yaml index 2b0941bc..55617733 100644 --- a/example/wordpress/dev/stack.yaml +++ b/example/wordpress-cloud-rds/prod/stack.yaml @@ -1,2 +1,2 @@ # The stack basic info -name: dev \ No newline at end of file +name: prod diff --git a/example/wordpress/project.yaml b/example/wordpress-cloud-rds/project.yaml similarity index 69% rename from example/wordpress/project.yaml rename to example/wordpress-cloud-rds/project.yaml index f998db66..4b3399a7 100644 --- a/example/wordpress/project.yaml +++ b/example/wordpress-cloud-rds/project.yaml @@ -1,4 +1,4 @@ # The project basic info -name: wordpress +name: wordpress-cloud-rds generator: type: AppConfiguration \ No newline at end of file diff --git a/example/wordpress-local-db/prod/kcl.mod b/example/wordpress-local-db/prod/kcl.mod new file mode 100644 index 00000000..69ec7762 --- /dev/null +++ b/example/wordpress-local-db/prod/kcl.mod @@ -0,0 +1,9 @@ +[package] +name = "wordpress-local-db" +version = "0.1.0" + +[dependencies] +catalog = { git = "https://github.com/KusionStack/catalog.git", tag = "0.1.2" } +[profile] +entries = ["main.k"] + diff --git a/example/wordpress-local-db/prod/main.k b/example/wordpress-local-db/prod/main.k new file mode 100644 index 00000000..2852d9d8 --- /dev/null +++ b/example/wordpress-local-db/prod/main.k @@ -0,0 +1,34 @@ +import catalog.models.schema.v1 as ac +import catalog.models.schema.v1.workload as wl +import catalog.models.schema.v1.workload.container as c +import catalog.models.schema.v1.workload.network as n +import catalog.models.schema.v1.accessories.mysql + +# main.k declares customized configurations for prod stack. +wordpress: ac.AppConfiguration { + workload: wl.Service { + containers: { + wordpress: c.Container { + image: "wordpress:6.3" + env: { + "WORDPRESS_DB_HOST": "$(KUSION_DB_HOST_WORDPRESS_MYSQL)" + "WORDPRESS_DB_USER": "$(KUSION_DB_USERNAME_WORDPRESS_MYSQL)" + "WORDPRESS_DB_PASSWORD": "$(KUSION_DB_PASSWORD_WORDPRESS_MYSQL)" + "WORDPRESS_DB_NAME": "mysql" + } + } + } + replicas: 1 + ports: [ + n.Port { + port: 80 + } + ] + } + database: { + wordpress: mysql.MySQL { + type: "local" + version: "8.0" + } + } +} diff --git a/example/wordpress-local-db/prod/stack.yaml b/example/wordpress-local-db/prod/stack.yaml new file mode 100644 index 00000000..55617733 --- /dev/null +++ b/example/wordpress-local-db/prod/stack.yaml @@ -0,0 +1,2 @@ +# The stack basic info +name: prod diff --git a/example/wordpress-local-db/project.yaml b/example/wordpress-local-db/project.yaml new file mode 100644 index 00000000..d09b7a72 --- /dev/null +++ b/example/wordpress-local-db/project.yaml @@ -0,0 +1,4 @@ +# The project basic info +name: wordpress-local-db +generator: + type: AppConfiguration diff --git a/example/wordpress/dev/main.k b/example/wordpress/dev/main.k deleted file mode 100644 index d7344f6c..00000000 --- a/example/wordpress/dev/main.k +++ /dev/null @@ -1,43 +0,0 @@ -import catalog.models.schema.v1 as ac -import catalog.models.schema.v1.trait as t -import catalog.models.schema.v1.workload as wl -import catalog.models.schema.v1.workload.container as c -import catalog.models.schema.v1.workload.container.probe as p -import catalog.models.schema.v1.workload.secret as sec -import catalog.models.schema.v1.workload.network as n -import catalog.models.schema.v1.monitoring as m -import catalog.models.schema.v1.accessories.database as db - -# main.k declares reusable configurations for all stacks. -wordpress: ac.AppConfiguration { - # the main workload configurations - workload: wl.Service { - containers: { - wordpress: c.Container { - image = "wordpress:4.8-apache" - env: { - "WORDPRESS_DB_HOST": "secret://wordpress-db/hostAddress" - "WORDPRESS_DB_PASSWORD": "secret://wordpress-db/password" - } - resources: { - "cpu": "500m" - "memory": "512Mi" - } - } - } - replicas: 1 - ports: [ - n.Port { - port: 80 - } - ] - } - # database accessory configurations - database: db.Database { - type: "alicloud" - engine: "MySQL" - version: "5.7" - size: 20 - instanceType: "mysql.n2.serverless.1c" - } -} \ No newline at end of file diff --git a/example/wordpress/dev/platform.k b/example/wordpress/dev/platform.k deleted file mode 100644 index 9260691a..00000000 --- a/example/wordpress/dev/platform.k +++ /dev/null @@ -1,14 +0,0 @@ -import catalog.models.schema.v1 as ac - -# platform.k declares customized configurations -wordpress: ac.AppConfiguration { - database: { - category = "serverless_basic" - # SubnetID defines the virtual subnet ID associated with the VPC that the rds - # instance will be created in. The rds instance won't be created in user's own VPC - # if this field is not provided. - subnetID = [your-subnet-id] - securityIPs = ["0.0.0.0/0"] - privateRouting = False - } -}