Updating kustomize and Contour (#683)

Contour version was very old. I replaced it with v0.11.1 Important note: we cannot directly use the remote yaml because it has a namespace and kustomize's namespace transformer causes conflicts. So i manually removed the namespace from the deployment Important: Now console is simply available at `localhost/console` if running locally or the best way to get the console is ```bash ❯ kubectl get -n flyte service envoy -o wide NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE SELECTOR envoy LoadBalancer 10.96.225.227 localhost 80:32613/TCP,443:30037/TCP 2m18s app=envoy ``` You can use the External IP
flyteorg · Jan 30, 2021 · c9b9fad · c9b9fad
1 parent 7e94de2
commit c9b9fad
Show file tree

Hide file tree

Showing 12 changed files with 3,710 additions and 614 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ endef
 
 .PHONY: kustomize
 kustomize:
-	KUSTOMIZE_VERSION=3.8.4 bash script/generate_kustomize.sh
+	KUSTOMIZE_VERSION=3.9.2 bash script/generate_kustomize.sh
 
 .PHONY: deploy_sandbox
 deploy_sandbox:

diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -8003,8 +8003,6 @@ data:
   af_spark-role-binding.yaml: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: RoleBinding\nmetadata:\n  name: spark-role-binding\n  namespace: {{ namespace }} \nroleRef:\n  apiGroup: rbac.authorization.k8s.io\n  kind: Role\n  name: spark-role\nsubjects:\n- kind: ServiceAccount\n  name: spark\n  namespace: {{ namespace }}\n\n"
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: clusterresource-template-tkdkkt4cb5
   namespace: flyte
 ---
@@ -8052,8 +8050,6 @@ data:
         maxDownloadMBs: 10
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: datacatalog-config-2bb94tc5b5
   namespace: flyte
 ---
@@ -8161,8 +8157,6 @@ data:
         storage: 2000Mi
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-admin-config-g79597h75m
   namespace: flyte
 ---
@@ -8335,8 +8329,6 @@ data:
         cloudwatch-log-group: <log-group>
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-propeller-config-ct29cf4cch
   namespace: flyte
 ---
@@ -8345,8 +8337,6 @@ data:
   pass.txt: eW91cnBhc3N3b3Jk
 kind: Secret
 metadata:
-  annotations: {}
-  labels: {}
   name: db-pass-bthd2588cc
   namespace: flyte
 type: Opaque

diff --git a/deployment/gcp/flyte_generated.yaml b/deployment/gcp/flyte_generated.yaml
@@ -7999,8 +7999,6 @@ data:
   af_spark-role-binding.yaml: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: RoleBinding\nmetadata:\n  name: spark-role-binding\n  namespace: {{ namespace }} \nroleRef:\n  apiGroup: rbac.authorization.k8s.io\n  kind: Role\n  name: spark-role\nsubjects:\n- kind: ServiceAccount\n  name: spark\n  namespace: {{ namespace }}\n\n"
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: clusterresource-template-tkdkkt4cb5
   namespace: flyte
 ---
@@ -8048,8 +8046,6 @@ data:
         maxDownloadMBs: 10
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: datacatalog-config-d56hkd9229
   namespace: flyte
 ---
@@ -8152,8 +8148,6 @@ data:
         storage: 2000Mi
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-admin-config-678t259tk4
   namespace: flyte
 ---
@@ -8322,8 +8316,6 @@ data:
         stackdriver-logresourcename: k8s_container
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-propeller-config-7288ccf2f8
   namespace: flyte
 ---
@@ -8332,8 +8324,6 @@ data:
   pass.txt: eW91cnBhc3N3b3Jk
 kind: Secret
 metadata:
-  annotations: {}
-  labels: {}
   name: db-pass-bthd2588cc
   namespace: flyte
 type: Opaque
@@ -8397,6 +8387,13 @@ metadata:
   namespace: flyte
 spec:
   ports:
+  - name: redoc
+    port: 87
+    protocol: TCP
+    targetPort: 8087
+  - name: http-metrics
+    port: 10254
+    protocol: TCP
   - name: http
     port: 80
     protocol: TCP
@@ -8405,13 +8402,6 @@ spec:
     port: 81
     protocol: TCP
     targetPort: 8089
-  - name: redoc
-    port: 87
-    protocol: TCP
-    targetPort: 8087
-  - name: http-metrics
-    port: 10254
-    protocol: TCP
   selector:
     app: flyteadmin
   type: LoadBalancer
@@ -8425,16 +8415,16 @@ metadata:
   namespace: flyte
 spec:
   ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 8080
   - name: redoc
     port: 87
     protocol: TCP
     targetPort: 8087
   - name: http-metrics
     port: 10254
     protocol: TCP
+  - port: 80
+    protocol: TCP
+    targetPort: 8080
   selector:
     app: flyteconsole
   type: LoadBalancer

diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
diff --git a/deployment/test/flyte_generated.yaml b/deployment/test/flyte_generated.yaml
@@ -385,8 +385,6 @@ data:
           enable-multicontainer: true
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: clusterresource-template-dtg8ff28mt
   namespace: flyte
 ---
@@ -424,8 +422,6 @@ data:
 
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: datacatalog-config-64k8dg9gck
   namespace: flyte
 ---
@@ -522,8 +518,6 @@ data:
         storage: 20Mi
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-admin-config-c96tt5m6b7
   namespace: flyte
 ---
@@ -631,8 +625,6 @@ data:
         kubernetes-url: "http://localhost:30082"
 kind: ConfigMap
 metadata:
-  annotations: {}
-  labels: {}
   name: flyte-propeller-config-c55k94mm2h
   namespace: flyte
 ---
@@ -690,6 +682,10 @@ metadata:
   namespace: flyte
 spec:
   ports:
+  - name: redoc
+    port: 87
+    protocol: TCP
+    targetPort: 8087
   - name: http
     port: 80
     protocol: TCP
@@ -698,10 +694,6 @@ spec:
     port: 81
     protocol: TCP
     targetPort: 8089
-  - name: redoc
-    port: 87
-    protocol: TCP
-    targetPort: 8087
   selector:
     app: flyteadmin
 ---
@@ -964,6 +956,12 @@ spec:
             cpu: "0.1"
             memory: 200Mi
       initContainers:
+      - command:
+        - sh
+        - -c
+        - until pg_isready -h postgres -p 5432; do echo waiting for database; sleep 2; done;
+        image: postgres:10.1
+        name: check-db-ready
       - command:
         - flyteadmin
         - --logtostderr
@@ -1014,22 +1012,16 @@ spec:
           name: config-volume
         - mountPath: /etc/db
           name: db-pass
-      - command:
-        - sh
-        - -c
-        - until pg_isready -h postgres -p 5432; do echo waiting for database; sleep 2; done;
-        image: postgres:10.1
-        name: check-db-ready
       serviceAccountName: flyteadmin
       volumes:
+      - configMap:
+          name: clusterresource-template-dtg8ff28mt
+        name: resource-templates
       - emptyDir: {}
         name: shared-data
       - configMap:
           name: flyte-admin-config-c96tt5m6b7
         name: config-volume
-      - configMap:
-          name: clusterresource-template-dtg8ff28mt
-        name: resource-templates
       - name: db-pass
         secret:
           secretName: db-pass-9dgchhk2bm