Merge branch 'feature/k8sVersionUpgrade' into 'main'

Kubernetesversion Upgrade to 1.27

See merge request observability-bd-projects/one-observability-demo!128

Author: awsimaya

PetAdoptions/cdk/pet_stack/lib/services.ts

@@ -31,6 +31,7 @@ import { CfnJson, RemovalPolicy, Fn, Duration, Stack, StackProps, CfnOutput } fr
 import { readFileSync } from 'fs';
 import 'ts-replace-all'
 import { TreatMissingData, ComparisonOperator } from 'aws-cdk-lib/aws-cloudwatch';
+import { KubectlLayer } from 'aws-cdk-lib/lambda-layer-kubectl';
 
 export class Services extends Stack {
     constructor(scope: Construct, id: string, props?: StackProps) {
@@ -109,7 +110,8 @@ export class Services extends Stack {
         }
         // The VPC where all the microservices will be deployed into
         const theVPC = new ec2.Vpc(this, 'Microservices', {
-            cidr: cidrRange,
+            ipAddresses: ec2.IpAddresses.cidr(cidrRange),
+            // cidr: cidrRange,
             natGateways: 1,
             maxAzs: 2
         });
@@ -333,7 +335,8 @@ export class Services extends Stack {
             vpc: theVPC,
             defaultCapacity: 2,
             defaultCapacityInstance: ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.MEDIUM),
-            version: KubernetesVersion.V1_23
+            version: KubernetesVersion.of('1.27'),
+            kubectlLayer: new KubectlLayer(this, 'kubectl') 
         });
 
         const clusterSG = ec2.SecurityGroup.fromSecurityGroupId(this,'ClusterSG',cluster.clusterSecurityGroupId);

PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts

@@ -59,7 +59,7 @@ export class PetAdoptionsStepFn extends Construct {
 
 
     this.stepFn = new sfn.StateMachine(this, 'StateMachine', {
-      definition,
+      definitionBody: sfn.DefinitionBody.fromChainable(definition),
       tracingEnabled: true,
       timeout: Duration.minutes(5)
     });

PetAdoptions/cdk/pet_stack/package.json

@@ -13,22 +13,22 @@
   },
   "devDependencies": {
     "@aws-cdk/assert": "2.68.0",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^20.2.5",
-    "aws-cdk": "2.82.0",
-    "constructs": "^10.2.43",
-    "ts-jest": "^29.1.0",
+    "@types/jest": "^29.5.4",
+    "@types/node": "^20.5.7",
+    "aws-cdk": "2.93.0",
+    "constructs": "^10.2.69",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "ts-replace-all": "1.0.0",
-    "typescript": "^5.1.3",
-    "cdk-nag": "^2.27.28"
+    "typescript": "^5.2.2",
+    "cdk-nag": "^2.27.114"
   },
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "^2.82.0-alpha.0",
+    "@aws-cdk/aws-lambda-python-alpha": "^2.93.0-alpha.0",
     "@types/js-yaml": "4.0.5",
-    "aws-cdk-lib": "^2.82.0",
-    "cdk-ecr-deployment": "^2.5.6",
-    "jest": "^29.5.0",
+    "aws-cdk-lib": "^2.93.0",
+    "cdk-ecr-deployment": "^2.5.30",
+    "jest": "^29.6.4",
     "js-yaml": "^4.1.0",
     "source-map-support": "^0.5.21"
   }

PetAdoptions/cdk/pet_stack/resources/destroy_stack.sh

@@ -28,6 +28,9 @@ if [ -z $STACK_NAME_APP ]; then STACK_NAME_APP="Applications"; fi
 aws eks update-kubeconfig --name PetSite
 kubectl delete -f https://raw.githubusercontent.com/aws-samples/one-observability-demo/main/PetAdoptions/cdk/pet_stack/resources/load_balancer/crds.yaml
 
+#Deleting keycloak 
+kubectl delete namespace keycloak --force
+
 # Get rid of all resources (Application first, then cluster or it will fail)
 cdk destroy $STACK_NAME_APP --force
 cdk destroy $STACK_NAME --force

PetAdoptions/cdk/pet_stack/resources/setup-ssm-agent.yaml

@@ -34,22 +34,6 @@ subjects:
   name: ssm-agent-installer 
   namespace: node-configuration-daemonset
 ---
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: ssm-agent-installer
-spec:
-  privileged: true
-  hostPID: true 
-  seLinux:
-    rule: RunAsAny
-  supplementalGroups:
-    rule: RunAsAny
-  runAsUser:
-    rule: RunAsAny
-  fsGroup:
-    rule: RunAsAny
----
 apiVersion: v1
 kind: ConfigMap
 metadata:

PetAdoptions/envsetup.sh

@@ -73,3 +73,6 @@ git clone https://github.com/aws-samples/one-observability-demo
 
 # Fetch usage tracker file
 # aws s3api get-object --bucket one-observability-workshop-tracker --key lab_user.txt lab_user.txt --region us-east-1
+
+# Install helm
+curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash

PetAdoptions/payforadoption-go/Dockerfile

@@ -1,6 +1,7 @@
 FROM golang:1.20 as builder
 WORKDIR /go/src/app
 COPY . .
+ENV GOPROXY=https://goproxy.io,direct
 RUN go get .
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
 

PetAdoptions/petlistadoptions-go/Dockerfile

@@ -1,6 +1,7 @@
 FROM golang:1.20 as builder
 WORKDIR /go/src/app
 COPY . .
+ENV GOPROXY=https://goproxy.io,direct
 RUN go get .
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .