update gitpod-installation manifests

- add node affinity where ever needed so container doesn't run on ARM
trilogy-group · Jan 13, 2023 · fa9aef1 · fa9aef1
1 parent a424f84
commit fa9aef1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/install/infra/modules/eks/kubernetes.tf b/install/infra/modules/eks/kubernetes.tf
@@ -20,13 +20,6 @@ module "vpc" {
   enable_dns_hostnames = true
 }
 
-module "aws_ebs_csi_driver" {
-  source                = "github.com/andreswebs/terraform-aws-eks-ebs-csi-driver"
-  cluster_name          = var.cluster_name
-  cluster_oidc_provider = module.eks.oidc_provider_arn
-  iam_role_name         = "ebs-csi-controller-${var.cluster_name}"
-}
-
 resource "aws_security_group_rule" "eks-worker-ingress-self" {
   description              = "Allow node to communicate with each other"
   from_port                = 0
@@ -58,7 +51,6 @@ resource "aws_security_group_rule" "eks-cluster-ingress-node-https" {
   type                     = "ingress"
 }
 
-
 resource "aws_security_group" "nodes" {
   name   = "nodes-sg-${var.cluster_name}"
   vpc_id = module.vpc.vpc_id
@@ -211,7 +203,7 @@ module "eks" {
 
     ArmRegularWorkspaces = {
       instance_types = [var.arm_workspace_machine_type]
-      ami_id         = "ami-059f09228b2eed616"
+      ami_id         = "ami-04458375d2220b12f"
       name           = "ws-arm-regular-${var.cluster_name}"
       iam_role_name  = format("%s-%s", substr("${var.cluster_name}-arm-regular-ws-ng", 0, 58), random_string.ng_role_suffix.result)
       subnet_ids     = module.vpc.public_subnets
@@ -253,7 +245,7 @@ module "eks" {
 
     ArmHeadlessWorkspaces = {
       instance_types = [var.arm_workspace_machine_type]
-      ami_id         = "ami-059f09228b2eed616"
+      ami_id         = "ami-04458375d2220b12f"
       name           = "ws-arm-headless-${var.cluster_name}"
       iam_role_name  = format("%s-%s", substr("${var.cluster_name}-arm-headless-ws-ng", 0, 58), random_string.ng_role_suffix.result)
       subnet_ids     = module.vpc.public_subnets

diff --git a/install/infra/single-cluster/aws/terraform.tfvars b/install/infra/single-cluster/aws/terraform.tfvars
@@ -7,7 +7,7 @@ domain_name = "gitpod-infra-hybrid.k8.devfactory.com"
 region = "us-east-1"
 
 # make sure the cidr do not have any conflicts and will have IP ranges enough to split into 5 subnets
-vpc_cidr = "10.100.0.0/16"
+vpc_cidr = "172.28.0.0/16"
 
 # should be atleast 2 zones
 vpc_availability_zones = ["us-east-1a", "us-east-1b"]
@@ -17,7 +17,7 @@ vpc_availability_zones = ["us-east-1a", "us-east-1b"]
 # https://cloud-images.ubuntu.com/docs/aws/eks/
 cluster_version = "1.23"
 
-image_id = "ami-0f89411984ff168ca"
+image_id = "ami-053a2c50bbd863e25"
 
 create_external_database = false
 create_external_storage  = true

diff --git a/install/kots/charts/fluent-bit/Chart.yaml b/install/kots/charts/fluent-bit/Chart.yaml
@@ -5,8 +5,8 @@
 apiVersion: v2
 description: Gitpod fluent-bit
 name: fluent-bit
-version: 0.20.2
+version: 0.21.7
 dependencies:
   - name: fluent-bit
-    version: 0.20.2
+    version: 0.21.7
     repository: https://fluent.github.io/helm-charts
diff --git a/install/kots/manifests/gitpod-installation-status.yaml b/install/kots/manifests/gitpod-installation-status.yaml
@@ -26,12 +26,19 @@ spec:
         app: gitpod
         component: gitpod-installer-status
     spec:
+      affinity:
+         nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: gitpod.io/workload_meta
+                  operator: Exists
       restartPolicy: Always
       serviceAccountName: kotsadm
       containers:
         - name: installation-status
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
+          image: "public.ecr.aws/k1t8c0v2/bilal-cn-gp/installer:latest"
           envFrom:
             - configMapRef:
                 name: gitpod-kots-config

diff --git a/install/kots/manifests/gitpod-installer-job.yaml b/install/kots/manifests/gitpod-installer-job.yaml
@@ -40,7 +40,7 @@ spec:
       containers:
         - name: installer
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-fixes.0"
+          image: "public.ecr.aws/k1t8c0v2/bilal-cn-gp/installer:latest"
           volumeMounts:
             - mountPath: /mnt/node0
               name: node-fs0

diff --git a/install/kots/manifests/gitpod-log-collector.yaml b/install/kots/manifests/gitpod-log-collector.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   chart:
     name: fluent-bit
-    chartVersion: 0.20.2
+    chartVersion: 0.21.7
   helmVersion: v3
   useHelmInstall: false
   weight: 10