[ci] Revert "Cluster Reaper job for deleting bad pods (#3414)" (#3424)

This reverts commit df8da1b.

Signed-off-by: Raymond Roestenburg <[email protected]>

Author: ray-roestenburg-da

cluster/images/splice-debug/Dockerfile

@@ -5,16 +5,8 @@
 # so we're hard-coding amd64, and accepting that this will break on arm64.
 FROM --platform=linux/amd64 ubuntu:24.04@sha256:440dcf6a5640b2ae5c77724e68787a906afb8ddee98bf86db94eea8528c2c076
 LABEL org.opencontainers.image.base.name="ubuntu:24.04"
-ARG KUBECTL_VERSION
-
-RUN apt-get update && apt-get install -y \
-    postgresql-client \
-    curl \
-    netcat-openbsd \
-    jq
-
-RUN curl -fL -LO https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
+RUN apt-get update && apt-get install -y postgresql-client curl netcat-openbsd
 RUN curl -sSLO https://github.com/fullstorydev/grpcurl/releases/download/v1.9.2/grpcurl_1.9.2_linux_amd64.deb && dpkg -i grpcurl_1.9.2_linux_amd64.deb && rm grpcurl_1.9.2_linux_amd64.deb
 
 COPY target/LICENSE .

cluster/images/splice-debug/local.mk

@@ -4,6 +4,6 @@
 dir := $(call current_dir)
 
 $(dir)/$(docker-build): $(dir)/target/LICENSE
-$(dir)/$(docker-build): build_arg := --build-arg KUBECTL_VERSION=v${KUBECTL_VERSION}
+
 $(dir)/target/LICENSE: ${SPLICE_ROOT}/cluster/images/LICENSE
 	cp $< $@

cluster/pulumi/infra/src/config.ts

@@ -93,7 +93,6 @@ export const InfraConfigSchema = z.object({
         extraWhitelistedIngress: z.array(z.string()).default([]),
       })
       .optional(),
-    enableGCReaperJob: z.boolean().default(false),
     prometheus: z.object({
       storageSize: z.string(),
       retentionDuration: z.string(),
@@ -118,7 +117,7 @@ export type Config = z.infer<typeof InfraConfigSchema>;
 // eslint-disable-next-line
 // @ts-ignore
 const fullConfig = InfraConfigSchema.parse(clusterYamlConfig);
-export const enableGCReaperJob = fullConfig.infra.enableGCReaperJob;
+
 console.error(
   `Loaded infra config: ${util.inspect(fullConfig, {
     depth: null,

cluster/pulumi/infra/src/index.ts

@@ -6,13 +6,7 @@ import { config } from '@lfdecentralizedtrust/splice-pulumi-common';
 import { clusterIsResetPeriodically, enableAlerts } from './alertings';
 import { configureAuth0 } from './auth0';
 import { configureCloudArmorPolicy } from './cloudArmor';
-import {
-  cloudArmorConfig,
-  clusterBaseDomain,
-  clusterBasename,
-  enableGCReaperJob,
-  monitoringConfig,
-} from './config';
+import { cloudArmorConfig, clusterBaseDomain, clusterBasename, monitoringConfig } from './config';
 import { installExtraCustomResources } from './extraCustomResources';
 import {
   getNotificationChannel,
@@ -21,7 +15,6 @@ import {
   installClusterMaintenanceUpdateAlerts,
 } from './gcpAlerts';
 import { configureIstio, istioMonitoring } from './istio';
-import { deployGCPodReaper } from './maintenance';
 import { configureNetwork } from './network';
 import { configureObservability } from './observability';
 import { configureStorage } from './storage';
@@ -55,10 +48,6 @@ configureCloudArmorPolicy(cloudArmorConfig);
 
 installExtraCustomResources();
 
-if (enableGCReaperJob) {
-  deployGCPodReaper('cluster-pod-gc-reaper', ['multi-validator'], { parent: network.ingressNs.ns });
-}
-
 let configuredAuth0;
 if (config.envFlag('CLUSTER_CONFIGURE_AUTH0', true)) {
   configuredAuth0 = configureAuth0(clusterBasename, network.dnsNames);

cluster/pulumi/infra/src/maintenance.ts

@@ -10,9 +10,9 @@ import {
   numNodesPerInstance,
 } from '@lfdecentralizedtrust/splice-pulumi-common';
 import { ServiceMonitor } from '@lfdecentralizedtrust/splice-pulumi-common/src/metrics';
-import { Version } from '@lfdecentralizedtrust/splice-pulumi-common/src/version';
 import _ from 'lodash';
 
+import { Version } from '../version';
 import { EnvironmentVariable, multiValidatorConfig } from './config';
 
 export interface BaseMultiNodeArgs {

cluster/pulumi/multi-validator/src/multiNodeDeployment.ts

@@ -133,5 +133,4 @@ in pkgs.mkShell {
 
   PULUMI_VERSION="${pkgs.pulumi-bin.version}";
   GECKODRIVER="${pkgs.geckodriver}/bin/geckodriver";
-  KUBECTL_VERSION="${pkgs.kubectl.version}";
 }