From 8af0ed1b96115715bf5a9a44f0ab3732b7d4e95e Mon Sep 17 00:00:00 2001
From: Josh Kneubuhl <jkneubuh@us.ibm.com>
Date: Wed, 9 Nov 2022 16:06:44 -0500
Subject: [PATCH] Updates to run the workshop on the Apple M1

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
---
 .../manager/fabric-operator-manager.yaml      | 22 +++++++++----------
 .../infrastructure/sample-network/network     |  2 +-
 .../sample-network/scripts/sample_network.sh  |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/config/manager/fabric-operator-manager.yaml b/full-stack-asset-transfer-guide/infrastructure/sample-network/config/manager/fabric-operator-manager.yaml
index 9311f343..f94e8c80 100644
--- a/full-stack-asset-transfer-guide/infrastructure/sample-network/config/manager/fabric-operator-manager.yaml
+++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/config/manager/fabric-operator-manager.yaml
@@ -49,26 +49,26 @@ spec:
         productChargedContainers: ""
         productMetric: "VIRTUAL_PROCESSOR_CORE"
     spec:
+      serviceAccountName: fabric-operator
       # hostIPC: false
       # hostNetwork: false
       # hostPID: false
-      serviceAccountName: fabric-operator
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/arch
-                    operator: In
-                    values:
-                      - amd64
+      # affinity:
+      #   nodeAffinity:
+      #     requiredDuringSchedulingIgnoredDuringExecution:
+      #       nodeSelectorTerms:
+      #         - matchExpressions:
+      #             - key: kubernetes.io/arch
+      #               operator: In
+      #               values:
+      #                 - amd64
       # securityContext:
       #   runAsNonRoot: true
       #   runAsUser: 1001
       #   fsGroup: 2000
 
       imagePullSecrets:
-        - name: ghcr-pull-secret
+        - name: image-pull-secret
 
       containers:
         - name: fabric-operator
diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network
index 13874712..bab91ed6 100755
--- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network
+++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network
@@ -41,7 +41,7 @@ context CONTAINER_CLI             docker                # or nerdctl for contain
 context CONTAINER_NAMESPACE       ""                    # or "--namespace k8s.io" for containerd / nerdctl
 context STORAGE_CLASS             standard
 context KUSTOMIZE_BUILD           "kubectl kustomize"
-context STAGE_DOCKER_IMAGES       true
+context STAGE_DOCKER_IMAGES       false
 context FABRIC_CONTAINER_REGISTRY hyperledger
 
 context NAME                      test-network
diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh
index 2e5c873e..8a56e892 100644
--- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh
+++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh
@@ -90,7 +90,7 @@ function launch_network_CAs() {
   apply_kustomization config/cas
 
   # give the operator a chance to run the first reconciliation on the new resource
-  sleep 1
+  sleep 10
 
   wait_for ibpca org0-ca
   wait_for ibpca org1-ca