diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index c0cb9ee0d604c1..318d8cd94d77e0 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -4255,7 +4255,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -8392,7 +8392,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 49fb17d3a5da86da4235edbf6ed37500f9b781371f6d605ee504e295f23d0aae + gitpod.io/checksum_config: 65e23bb77e8a1542e50114317fe7c1eb04cec9a5f4c82b11f8cf2a8d3b20c511 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 122fb107a5a28d..715c3a9ae1ba34 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -4119,7 +4119,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -8244,7 +8244,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 49fb17d3a5da86da4235edbf6ed37500f9b781371f6d605ee504e295f23d0aae + gitpod.io/checksum_config: 65e23bb77e8a1542e50114317fe7c1eb04cec9a5f4c82b11f8cf2a8d3b20c511 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 171b3780efdc37..342f6e56aef344 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -5056,7 +5056,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -9802,7 +9802,7 @@ spec: metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: aab520446d4937685907939b2aea9111f2a691427cb4bdbf1b586f1b15b10f08 + gitpod.io/checksum_config: 57e826b6b832dd75e184270a64128d56d5122d45fa529acec7928ac6f640299d hello: world creationTimestamp: null labels: diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index c508dd1fd61b19..61149b0d185090 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -4306,7 +4306,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -8670,7 +8670,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index 1c47797e333336..c90763c28f4009 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -4080,7 +4080,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -8173,7 +8173,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: be459a9d71866b87da87cd017d0063334112640ca956927773eb7adaf885c00b + gitpod.io/checksum_config: 966d2e2fee61a2269e648d2a2705eb7ccfc48460e97533ee77c7c857ffb1bb6b creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index 46b78963240da0..4755a7215c2930 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -4529,7 +4529,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -10091,7 +10091,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 04075de4b018ce..3f59a169f6aad2 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -4526,7 +4526,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -9045,7 +9045,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 56e65812550898..e6e31ee87cd55e 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -4538,7 +4538,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -9057,7 +9057,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index bc6ad12854bacf..ad4c29504d0199 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -4859,7 +4859,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -9489,7 +9489,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index b2c23fbb5e1460..046420498cafac 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -4529,7 +4529,7 @@ data: "minAgePrebuildDays": 7, "contentRetentionPeriodDays": 21, "contentChunkLimit": 1000, - "purgeRetentionPeriodDays": 1095, + "purgeRetentionPeriodDays": 730, "purgeChunkLimit": 1000 }, "authProviderConfigFiles": [], @@ -9048,7 +9048,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: bc10d1cc9e580a47b65956152d9caad8a870aba5ea805523e17282cb8533b8e8 + gitpod.io/checksum_config: 5730cba43c5427db3f15e751144001295b81609822685e3baa945000fe1f6a32 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/pkg/components/server/configmap.go b/install/installer/pkg/components/server/configmap.go index e3fb1c999e6040..4308518c0c8e2b 100644 --- a/install/installer/pkg/components/server/configmap.go +++ b/install/installer/pkg/components/server/configmap.go @@ -193,7 +193,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { ChunkLimit: 1000, ContentRetentionPeriodDays: 21, ContentChunkLimit: 1000, - PurgeRetentionPeriodDays: 365 * 3, + PurgeRetentionPeriodDays: 365 * 2, PurgeChunkLimit: 1000, }, EnableLocalApp: enableLocalApp,