diff --git a/deploy_carvel/concierge/build.yaml b/deploy_carvel/concierge/build.yaml index ef3676fd..1d049bc3 100644 --- a/deploy_carvel/concierge/build.yaml +++ b/deploy_carvel/concierge/build.yaml @@ -1,11 +1,15 @@ +#@ load("@ytt:data", "data") +--- apiVersion: kbld.k14s.io/v1alpha1 kind: Config -minimumRequiredVersion: 0.31.0 # minimum version of kbld. We probably don't need to specify. +minimumRequiredVersion: 0.31.0 #! minimum version of kbld. We probably don't need to specify. overrides: #! TODO: in the pinniped yamls, this is provided by values.yaml, not declared in the deployment. #! we should assess if we want to leave it there or move it to this form of configuration. -- image: projects.registry.vmware.com/pinniped/pinniped-server:latest - newImage: "" +- image: projects.registry.vmware.com/pinniped/pinniped-server + newImage: #@ data.values.image_repo + + #! I don't think we need any of these (until we need them 😊). IE, don't use prematurely. diff --git a/deploy_carvel/concierge/package-template.yml b/deploy_carvel/concierge/package-template.yml new file mode 100644 index 00000000..cbfe0a9b --- /dev/null +++ b/deploy_carvel/concierge/package-template.yml @@ -0,0 +1,31 @@ +#@ load("@ytt:data", "data") # for reading data values (generated via ytt's data-values-schema-inspect mode). +#@ load("@ytt:yaml", "yaml") # for dynamically decoding the output of ytt's data-values-schema-inspect +--- +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: Package +metadata: + name: #@ "concierge.pinniped.dev." + data.values.version +spec: + refName: concierge.pinniped.dev + version: #@ data.values.version + releaseNotes: | + Initial release of the pinniped concierge package, TODO: AUTOMATE THIS?? + valuesSchema: + openAPIv3: #@ yaml.decode(data.values.openapi)["components"]["schemas"]["dataValues"] + template: + spec: + fetch: + - imgpkgBundle: +#! TODO: we will need a place to host this. +#! this package image needs to be built and deployed so it can then be installed. + image: #@ "${REPO_HOST}/packages/pinniped-concierge:" + data.values.version + template: + - ytt: + paths: + - "config/" + - kbld: + paths: + - ".imgpkg/images.yml" + - "-" + deploy: + - kapp: {} diff --git a/deploy_carvel/supervisor/build.yaml b/deploy_carvel/supervisor/build.yaml index ef3676fd..1d049bc3 100644 --- a/deploy_carvel/supervisor/build.yaml +++ b/deploy_carvel/supervisor/build.yaml @@ -1,11 +1,15 @@ +#@ load("@ytt:data", "data") +--- apiVersion: kbld.k14s.io/v1alpha1 kind: Config -minimumRequiredVersion: 0.31.0 # minimum version of kbld. We probably don't need to specify. +minimumRequiredVersion: 0.31.0 #! minimum version of kbld. We probably don't need to specify. overrides: #! TODO: in the pinniped yamls, this is provided by values.yaml, not declared in the deployment. #! we should assess if we want to leave it there or move it to this form of configuration. -- image: projects.registry.vmware.com/pinniped/pinniped-server:latest - newImage: "" +- image: projects.registry.vmware.com/pinniped/pinniped-server + newImage: #@ data.values.image_repo + + #! I don't think we need any of these (until we need them 😊). IE, don't use prematurely. diff --git a/deploy_carvel/supervisor/package-template.yml b/deploy_carvel/supervisor/package-template.yml new file mode 100644 index 00000000..714d214d --- /dev/null +++ b/deploy_carvel/supervisor/package-template.yml @@ -0,0 +1,31 @@ +#@ load("@ytt:data", "data") # for reading data values (generated via ytt's data-values-schema-inspect mode). +#@ load("@ytt:yaml", "yaml") # for dynamically decoding the output of ytt's data-values-schema-inspect +--- +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: Package +metadata: + name: #@ "supervisor.pinniped.dev." + data.values.version +spec: + refName: supervisor.pinniped.dev + version: #@ data.values.version + releaseNotes: | + Initial release of the pinniped supervisor package, TODO: AUTOMATE THIS?? + valuesSchema: + openAPIv3: #@ yaml.decode(data.values.openapi)["components"]["schemas"]["dataValues"] + template: + spec: + fetch: + - imgpkgBundle: +#! TODO: we will need a place to host this. +#! this package image needs to be built and deployed so it can then be installed. + image: #@ "${REPO_HOST}/packages/pinniped-supervisor:" + data.values.version + template: + - ytt: + paths: + - "config/" + - kbld: + paths: + - ".imgpkg/images.yml" + - "-" + deploy: + - kapp: {}