diff --git a/.github/workflows/build-and-publish-images.yaml b/.github/workflows/build-and-publish-images.yaml index e051aa9a..7608afb4 100644 --- a/.github/workflows/build-and-publish-images.yaml +++ b/.github/workflows/build-and-publish-images.yaml @@ -215,6 +215,7 @@ jobs: ytt -f carvel-packages/cluster-essentials/config/package.yaml \ -f carvel-packages/training-platform/config/schema.yaml \ -v version=${{env.REPOSITORY_TAG}} \ + -v releasedAt=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ -v imageRegistry.host=ghcr.io \ -v imageRegistry.namespace=${{github.repository_owner}} > educates-cluster-essentials.yaml @@ -243,6 +244,7 @@ jobs: ytt -f carvel-packages/training-platform/config/package.yaml \ -f carvel-packages/training-platform/config/schema.yaml \ -v version=${{env.REPOSITORY_TAG}} \ + -v releasedAt=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ -v imageRegistry.host=ghcr.io \ -v imageRegistry.namespace=${{github.repository_owner}} > educates-training-platform.yaml diff --git a/Makefile b/Makefile index 481f83c0..b01f2b78 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ push-cluster-essentials-bundle: ytt -f carvel-packages/cluster-essentials/bundle/config | kbld -f - --imgpkg-lock-output carvel-packages/cluster-essentials/bundle/.imgpkg/images.yml imgpkg push -b $(IMAGE_REPOSITORY)/educates-cluster-essentials:$(RELEASE_VERSION) -f carvel-packages/cluster-essentials/bundle mkdir -p testing - ytt -f carvel-packages/cluster-essentials/config/package.yaml -f carvel-packages/cluster-essentials/config/schema.yaml -v imageRegistry.host=$(IMAGE_REPOSITORY) -v version=$(RELEASE_VERSION) > testing/educates-cluster-essentials.yaml + ytt -f carvel-packages/cluster-essentials/config/package.yaml -f carvel-packages/cluster-essentials/config/schema.yaml -v imageRegistry.host=$(IMAGE_REPOSITORY) -v version=$(RELEASE_VERSION) -v releasedAt=`date -u +"%Y-%m-%dT%H:%M:%SZ"` > testing/educates-cluster-essentials.yaml deploy-cluster-essentials: ifneq ("$(wildcard testing/values.yaml)","") @@ -129,7 +129,7 @@ push-training-platform-bundle: cat carvel-packages/training-platform/bundle/kbld-images.yaml | kbld -f - --imgpkg-lock-output carvel-packages/training-platform/bundle/.imgpkg/images.yml imgpkg push -b $(IMAGE_REPOSITORY)/educates-training-platform:$(RELEASE_VERSION) -f carvel-packages/training-platform/bundle mkdir -p testing - ytt -f carvel-packages/training-platform/config/package.yaml -f carvel-packages/training-platform/config/schema.yaml -v imageRegistry.host=$(IMAGE_REPOSITORY) -v version=$(RELEASE_VERSION) > testing/educates-training-platform.yaml + ytt -f carvel-packages/training-platform/config/package.yaml -f carvel-packages/training-platform/config/schema.yaml -v imageRegistry.host=$(IMAGE_REPOSITORY) -v version=$(RELEASE_VERSION) -v releasedAt=`date -u +"%Y-%m-%dT%H:%M:%SZ"` > testing/educates-training-platform.yaml deploy-training-platform: ifneq ("$(wildcard testing/values.yaml)","") diff --git a/carvel-packages/cluster-essentials/bundle/.imgpkg/images.yml b/carvel-packages/cluster-essentials/bundle/.imgpkg/images.yml index 674a9bf9..c69ca0c6 100644 --- a/carvel-packages/cluster-essentials/bundle/.imgpkg/images.yml +++ b/carvel-packages/cluster-essentials/bundle/.imgpkg/images.yml @@ -29,11 +29,4 @@ images: tag: v1.20.1 url: ghcr.io/projectcontour/contour:v1.20.1 image: ghcr.io/projectcontour/contour@sha256:6e6c6cbe03eba0df8987da4cac2712845f66c496185383d8768f19b40be26125 -- annotations: - kbld.carvel.dev/id: metacontrollerio/metacontroller:v4.2.0 - kbld.carvel.dev/origins: | - - resolved: - tag: v4.2.0 - url: metacontrollerio/metacontroller:v4.2.0 - image: index.docker.io/metacontrollerio/metacontroller@sha256:e28e2e18ad4ef8299b9c399dd5d4679b3bea8383a28460efbee10151e90c4cc5 kind: ImagesLock diff --git a/carvel-packages/cluster-essentials/config/package.yaml b/carvel-packages/cluster-essentials/config/package.yaml index 9b0d9811..071e549f 100644 --- a/carvel-packages/cluster-essentials/config/package.yaml +++ b/carvel-packages/cluster-essentials/config/package.yaml @@ -19,6 +19,7 @@ metadata: spec: refName: cluster-essentials.educates.dev version: #@ data.values.version + releasedAt: #@ data.values.releasedAt template: spec: fetch: diff --git a/carvel-packages/cluster-essentials/config/schema.yaml b/carvel-packages/cluster-essentials/config/schema.yaml index fcf7199f..409ad2c8 100644 --- a/carvel-packages/cluster-essentials/config/schema.yaml +++ b/carvel-packages/cluster-essentials/config/schema.yaml @@ -6,3 +6,5 @@ version: latest imageRegistry: host: "localhost:5001" namespace: "" + +releasedAt: "" diff --git a/carvel-packages/training-platform/config/package.yaml b/carvel-packages/training-platform/config/package.yaml index 63c420f9..d3146257 100644 --- a/carvel-packages/training-platform/config/package.yaml +++ b/carvel-packages/training-platform/config/package.yaml @@ -19,6 +19,7 @@ metadata: spec: refName: training-platform.educates.dev version: #@ data.values.version + releasedAt: #@ data.values.releasedAt template: spec: fetch: diff --git a/carvel-packages/training-platform/config/schema.yaml b/carvel-packages/training-platform/config/schema.yaml index fcf7199f..409ad2c8 100644 --- a/carvel-packages/training-platform/config/schema.yaml +++ b/carvel-packages/training-platform/config/schema.yaml @@ -6,3 +6,5 @@ version: latest imageRegistry: host: "localhost:5001" namespace: "" + +releasedAt: ""