New: Intro section for ReInvent

lab/bin/reset-environment

@@ -106,24 +106,29 @@ kubectl delete pod load-generator --ignore-not-found
 
 kubectl delete namespace other --ignore-not-found
 
-kubectl apply -k $base_path --prune --all \
-  --prune-allowlist=autoscaling/v1/HorizontalPodAutoscaler \
-  --prune-allowlist=core/v1/Service \
-  --prune-allowlist=core/v1/ConfigMap \
-  --prune-allowlist=apps/v1/Deployment \
-  --prune-allowlist=apps/v1/StatefulSet \
-  --prune-allowlist=core/v1/ServiceAccount \
-  --prune-allowlist=core/v1/Secret \
-  --prune-allowlist=core/v1/PersistentVolumeClaim \
-  --prune-allowlist=scheduling.k8s.io/v1/PriorityClass \
-  --prune-allowlist=networking.k8s.io/v1/Ingress
+if [[ $module != introduction/basics* ]]; then    
+    kubectl apply -k $base_path --prune --all \
+      --prune-allowlist=autoscaling/v1/HorizontalPodAutoscaler \
+      --prune-allowlist=core/v1/Service \
+      --prune-allowlist=core/v1/ConfigMap \
+      --prune-allowlist=apps/v1/Deployment \
+      --prune-allowlist=apps/v1/StatefulSet \
+      --prune-allowlist=core/v1/ServiceAccount \
+      --prune-allowlist=core/v1/Secret \
+      --prune-allowlist=core/v1/PersistentVolumeClaim \
+      --prune-allowlist=scheduling.k8s.io/v1/PriorityClass \
+      --prune-allowlist=networking.k8s.io/v1/Ingress
+
+    logmessage "\n⏳ Waiting for application to become ready..."
+
+    sleep 10
+
+    kubectl wait --for=condition=available --timeout=240s deployments -l app.kubernetes.io/created-by=eks-workshop -A
+    kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
 
-logmessage "\n⏳ Waiting for application to become ready..."
-
-sleep 10
-
-kubectl wait --for=condition=available --timeout=240s deployments -l app.kubernetes.io/created-by=eks-workshop -A
-kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+else
+    kubectl delete -k $base_path --ignore-not-found
+fi
 
 # Addons
 rm -rf /eks-workshop/terraform
@@ -238,10 +243,12 @@ if [ $EXIT_CODE -ne 0 ]; then
 fi
 
 # Recycle workload pods in case stateful pods got restarted
-kubectl delete pod -l app.kubernetes.io/created-by=eks-workshop -l app.kubernetes.io/component=service -A
+kubectl delete pod -l app.kubernetes.io/created-by=eks-workshop -l app.kubernetes.io/component=service -A --ignore-not-found
 
 # Wait for the workload pods previously recycled
-kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+if kubectl get pods -A -l app.kubernetes.io/created-by=eks-workshop 2>/dev/null | grep -q .; then
+  kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+fi
 
 # Finished
 logmessage "\n✅ Environment is ${GREEN}ready${NC}!"

manifests/modules/introduction/basics/.workshop/cleanup.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+echo "Cleaning up Kubernetes Basics module resources..."
+
+# Clean up pods
+echo "Cleaning up pods..."
+kubectl delete pod ui-pod -n ui --ignore-not-found=true
+kubectl delete pod test-pod --ignore-not-found=true
+
+# Clean up secrets
+echo "Cleaning up secrets..."
+kubectl delete secret catalog-db -n catalog --ignore-not-found=true
+
+# Clean up daemonsets
+echo "Cleaning up daemonsets..."
+kubectl delete daemonset log-collector -n kube-system --ignore-not-found=true
+
+# Clean up jobs and cronjobs
+echo "Cleaning up jobs and cronjobs..."
+kubectl delete job data-processor -n catalog --ignore-not-found=true
+kubectl delete cronjob catalog-cleanup -n catalog --ignore-not-found=true
+kubectl delete job manual-cleanup -n catalog --ignore-not-found=true
+
+# Delete any jobs that start with catalog-cleanup (created by CronJob)
+kubectl get jobs -n catalog -o name 2>/dev/null | grep "job/catalog-cleanup" | xargs -r kubectl delete -n catalog --ignore-not-found=true
+
+# Clean up namespaces (do this last as it will clean up any remaining resources)
+echo "Cleaning up namespaces..."
+kubectl delete namespace ui --ignore-not-found=true
+kubectl delete namespace catalog --ignore-not-found=true
+
+echo "Kubernetes Basics module cleanup completed."

manifests/modules/introduction/basics/configmaps/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../base-application/ui

manifests/modules/introduction/basics/configmaps/ui-pod-with-config.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: ui-pod
+  namespace: ui
+  labels:
+    app.kubernetes.io/name: ui
+    app.kubernetes.io/component: service
+    app.kubernetes.io/created-by: eks-workshop
+spec:
+  containers:
+  - name: ui
+    image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.4.0
+    ports:
+    - containerPort: 8080
+    envFrom:
+    - configMapRef:
+        name: ui
+    resources:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "256Mi"
+        cpu: "200m"

manifests/modules/introduction/basics/daemonsets/log-collector.yaml

@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: log-collector
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: log-collector
+    app.kubernetes.io/created-by: eks-workshop
+spec:
+  selector:
+    matchLabels:
+      app: log-collector
+  template:
+    metadata:
+      labels:
+        app: log-collector
+    spec:
+      containers:
+      - name: fluentd
+        image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable
+        volumeMounts:
+        - name: varlog
+          mountPath: /var/log
+          readOnly: true
+        - name: containers
+          mountPath: /var/lib/docker/containers
+          readOnly: true
+        resources:
+          requests:
+            cpu: 100m
+            memory: 128Mi
+          limits:
+            cpu: 200m
+            memory: 256Mi
+      volumes:
+      - name: varlog
+        hostPath:
+          path: /var/log
+      - name: containers
+        hostPath:
+          path: /var/lib/docker/containers

manifests/modules/introduction/basics/jobs/catalog-cleanup.yaml

@@ -0,0 +1,52 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: catalog-cleanup
+  namespace: catalog
+  labels:
+    app.kubernetes.io/name: catalog-cleanup
+    app.kubernetes.io/created-by: eks-workshop
+spec:
+  schedule: "*/1 * * * *"  # Every 1 minute for demo purposes
+  timeZone: "UTC"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            app: catalog-cleanup
+        spec:
+          restartPolicy: OnFailure
+          containers:
+          - name: cleanup
+            image: busybox:1.36
+            command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Starting cleanup job at $(date)"
+              echo "Checking for temporary files..."
+
+              # Simulate finding and cleaning up files
+              echo "Found 3 temporary files to clean up:"
+              echo "  - /tmp/cache_file_1.tmp"
+              echo "  - /tmp/cache_file_2.tmp" 
+              echo "  - /tmp/old_log.log"
+
+              # Simulate cleanup process
+              sleep 3
+              echo "Cleaning up temporary files..."
+              sleep 2
+              echo "Temporary files removed successfully"
+
+              echo "Cleanup completed at $(date)"
+              echo "Next cleanup scheduled in 1 minute"
+            resources:
+              requests:
+                cpu: 50m
+                memory: 64Mi
+              limits:
+                cpu: 100m
+                memory: 128Mi

manifests/modules/introduction/basics/jobs/data-processing-job.yaml

@@ -0,0 +1,55 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: data-processor
+  namespace: catalog
+  labels:
+    app.kubernetes.io/name: data-processor
+    app.kubernetes.io/created-by: eks-workshop
+spec:
+  completions: 1
+  parallelism: 1
+  backoffLimit: 3
+  template:
+    metadata:
+      labels:
+        app: data-processor
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: processor
+        image: busybox:1.36
+        command:
+        - /bin/sh
+        - -c
+        - |
+          echo "Starting data processing job..."
+          echo "Processing catalog data files..."
+
+          # Simulate processing multiple files
+          for i in $(seq 1 5); do
+            echo "Processing file $i/5..."
+            sleep 2
+            echo "File $i processed successfully"
+          done
+
+          echo "Generating summary report..."
+          cat > /tmp/processing-report.txt << EOF
+          Data Processing Report
+          =====================
+          Job: data-processor
+          Date: $(date)
+          Files processed: 5
+          Status: Completed successfully
+          EOF
+
+          echo "Report generated:"
+          cat /tmp/processing-report.txt
+          echo "Data processing job completed successfully!"
+        resources:
+          requests:
+            cpu: 100m
+            memory: 128Mi
+          limits:
+            cpu: 200m
+            memory: 256Mi

manifests/modules/introduction/basics/namespaces/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ui
+  labels:
+    app.kubernetes.io/created-by: eks-workshop

manifests/modules/introduction/basics/pods/ui-pod.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: ui-pod
+  namespace: ui
+  labels:
+    app.kubernetes.io/name: ui
+    app.kubernetes.io/component: service
+spec:
+  containers:
+    - name: ui
+      image: public.ecr.aws/aws-containers/retail-store-sample-ui:1.2.1
+      ports:
+        - name: http
+          containerPort: 8080
+          protocol: TCP
+      env:
+        - name: JAVA_OPTS
+          value: -XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
+      resources:
+        requests:
+          cpu: 250m
+          memory: 1.5Gi
+        limits:
+          memory: 1.5Gi

manifests/modules/introduction/basics/secrets/catalog-pod-with-secret.yaml

@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: catalog-pod
+  namespace: catalog
+  labels:
+    app.kubernetes.io/name: catalog
+    app.kubernetes.io/component: service
+    app.kubernetes.io/created-by: eks-workshop
+spec:
+  containers:
+  - name: catalog
+    image: public.ecr.aws/aws-containers/retail-store-sample-catalog:1.2.1
+    ports:
+    - containerPort: 8080
+    envFrom:
+    - configMapRef:
+        name: catalog
+    - secretRef:
+        name: catalog-db
+    resources:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "256Mi"
+        cpu: "200m"

manifests/modules/introduction/basics/secrets/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../base-application/catalog

manifests/modules/introduction/basics/services/deployment.yaml

@@ -0,0 +1,26 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ui
+  labels:
+    app.kubernetes.io/created-by: eks-workshop
+    app.kubernetes.io/type: app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: ui
+      app.kubernetes.io/instance: ui
+      app.kubernetes.io/component: service
+  template:
+    spec:
+      containers:
+        - name: ui
+          env:
+            - name: MANAGEMENT_INFO_ENV_ENABLED
+              value: "true"
+            - name: INFO_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+

manifests/modules/introduction/basics/services/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../base-application/ui
+patches:
+  - path: deployment.yaml