feat(deployment): upgrade contour to 1.31.1 (chart 20.0.3) (#6898)

Author: dotansimha

.github/workflows/typescript-typecheck.yaml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
         with:
-          version: 'v3.18.1'
+          version: 'v3.18.4'
 
       - name: install helm deps
         run:

deployment/generate.ts

@@ -1,11 +1,6 @@
 import { execSync } from 'child_process';
 import { readFile, writeFile } from 'fs/promises';
-import { gunzip } from 'node:zlib';
-import { Readable } from 'stream';
-import { gunzipSync } from 'zlib';
-import * as yaml from 'js-yaml';
 import { compile } from 'json-schema-to-typescript';
-import { extract } from 'tar-stream';
 import { fileSync } from 'tmp';
 import { OTLP_COLLECTOR_CHART, VECTOR_HELM_CHART } from './utils/observability';
 import { CONTOUR_CHART } from './utils/reverse-proxy';
@@ -17,33 +12,6 @@ async function generateJsonSchemaFromHelmValues(input: string) {
   return await readFile(jsonSchemaTempFile.name, 'utf-8').then(r => JSON.parse(r));
 }
 
-function getFileFromTar(tar: Readable, filename: string) {
-  return new Promise(resolve => {
-    const extractInstance = extract();
-
-    extractInstance.on('entry', function (header, stream, next) {
-      if (header.name === filename) {
-        let data = '';
-        stream.on('data', chunk => (data += chunk));
-        stream.on('end', () => {
-          resolve(data);
-        });
-      }
-      stream.on('end', function () {
-        next(); // ready for next entry
-      });
-
-      stream.resume(); // just auto drain the stream
-    });
-
-    extractInstance.on('finish', function () {
-      // all entries read
-    });
-
-    tar.pipe(extractInstance);
-  });
-}
-
 async function generateOpenTelemetryCollectorTypes() {
   const jsonSchemaUrl = `https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-collector-${OTLP_COLLECTOR_CHART.version}/charts/opentelemetry-collector/values.schema.json`;
   const jsonSchema = await fetch(jsonSchemaUrl).then(res => res.json());
@@ -64,37 +32,8 @@ async function generateVectorDevTypes() {
 }
 
 async function generateContourTypes() {
-  let helmManifest = await fetch(`${CONTOUR_CHART.fetchOpts!['repo']}/index.yaml`, {
-    redirect: 'follow',
-  })
-    .then(r => r.text())
-    .then(r => yaml.load(r) as any);
-
-  let relevantChart = helmManifest.entries[CONTOUR_CHART['chart'] as string].find(
-    entry => entry.version === CONTOUR_CHART.version,
-  );
-
-  if (!relevantChart) {
-    throw new Error(
-      `Could not find chart ${CONTOUR_CHART['chart']} with version ${CONTOUR_CHART.version} in the Helm repository!`,
-    );
-  }
-
-  const url = relevantChart.urls.find((url: string) => url.endsWith('.tgz'));
-
-  if (!url) {
-    throw new Error(
-      `Could not find a .tgz file in the Helm repository for chart ${CONTOUR_CHART['chart']}!`,
-    );
-  }
-
-  const valuesFile = await fetch(url)
-    .then(r => r.arrayBuffer())
-    .then(r => Buffer.from(r))
-    .then(r => gunzipSync(r))
-    .then(r => Readable.from(r))
-    .then(r => getFileFromTar(r, 'contour/values.yaml'))
-    .then((r: any) => r.toString());
+  const helmValuesFileUrl = `https://raw.githubusercontent.com/bitnami/charts/contour/${CONTOUR_CHART.version}/bitnami/contour/values.yaml`;
+  const valuesFile = await fetch(helmValuesFileUrl).then(r => r.text());
 
   const valuesTempFile = fileSync();
   await writeFile(valuesTempFile.name, valuesFile);

deployment/package.json

@@ -12,20 +12,18 @@
     "@manypkg/get-packages": "2.2.2",
     "@pulumi/cloudflare": "4.16.0",
     "@pulumi/command": "1.0.1",
-    "@pulumi/kubernetes": "4.19.0",
+    "@pulumi/kubernetes": "4.23.0",
     "@pulumi/kubernetesx": "0.1.6",
-    "@pulumi/pulumi": "3.145.0",
-    "@pulumi/random": "4.16.2",
+    "@pulumi/pulumi": "3.185.0",
+    "@pulumi/random": "4.18.2",
     "js-yaml": "4.1.0",
-    "pg-connection-string": "2.7.0",
-    "prettier": "3.4.2",
-    "tar-stream": "3.1.7"
+    "pg-connection-string": "2.9.1",
+    "prettier": "3.4.2"
   },
   "devDependencies": {
     "@types/js-yaml": "4.0.9",
     "@types/mime-types": "2.1.4",
     "@types/node": "22.10.5",
-    "@types/tar-stream": "3.1.3",
     "@types/tmp": "0.2.6",
     "json-schema-to-typescript": "15.0.3",
     "tmp": "0.2.3",

deployment/utils/contour.types.ts

@@ -796,6 +796,10 @@ export interface ContourValues {
     defaultStorageClass?: string;
     imagePullSecrets?: unknown[];
     imageRegistry?: string;
+    security?: {
+      allowInsecureImages?: boolean;
+      [k: string]: unknown;
+    };
     storageClass?: string;
     [k: string]: unknown;
   };
@@ -858,5 +862,6 @@ export interface ContourValues {
     [k: string]: unknown;
   };
   tlsExistingSecret?: string;
+  useCertManager?: boolean;
   [k: string]: unknown;
 }

deployment/utils/reverse-proxy.ts

@@ -4,7 +4,7 @@ import { ContourValues } from './contour.types';
 import { helmChart } from './helm';
 
 // prettier-ignore
-export const CONTOUR_CHART = helmChart('https://raw.githubusercontent.com/bitnami/charts/refs/heads/index/bitnami/', 'contour', '19.3.1');
+export const CONTOUR_CHART = helmChart('https://raw.githubusercontent.com/bitnami/charts/refs/heads/index/bitnami/', 'contour', '20.0.3');
 
 export class Proxy {
   private lbService: Output<k8s.core.v1.Service> | null = null;