Remove flyteadmin config options which now have defaults (#917)

flyteorg · May 1, 2021 · e0dcb4d · e0dcb4d
1 parent 0acbea4
commit e0dcb4d
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 103 deletions.
diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -8142,13 +8142,6 @@ data:
     logger:
       show-source: true
       level: 2
-  remote_data.yaml: |
-    remoteData:
-      # TODO change this to match the region of the s3 bucket
-      region: "us-west-2"
-      scheme: aws
-      signedUrls:
-        durationMinutes: 3
   server.yaml: |
     server:
       httpPort: 8088
@@ -8193,14 +8186,6 @@ data:
           clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
     flyteadmin:
       roleNameKey: "iam.amazonaws.com/role"
-      profilerPort: 10254
-      metricsScope: "flyte:"
-      metadataStoragePrefix:
-        - "metadata"
-        - "admin"
-      eventVersion: 1
-      testing:
-        host: http://flyteadmin
   storage.yaml: |
     storage:
       type: stow
@@ -8232,7 +8217,7 @@ data:
         gpu: 1
 kind: ConfigMap
 metadata:
-  name: flyte-admin-config-4fd96h5bd6
+  name: flyte-admin-config-fh8cdtgk68
   namespace: flyte
 ---
 apiVersion: v1
@@ -8747,7 +8732,7 @@ spec:
       labels:
         app: flyteadmin
         app.kubernetes.io/name: flyteadmin
-        app.kubernetes.io/version: 0.3.38
+        app.kubernetes.io/version: 0.4.13
     spec:
       containers:
       - command:
@@ -8864,7 +8849,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: flyte-admin-config-4fd96h5bd6
+          name: flyte-admin-config-fh8cdtgk68
         name: config-volume
       - configMap:
           name: clusterresource-template-tkdkkt4cb5
@@ -9152,7 +9137,7 @@ spec:
               name: clusterresource-template-tkdkkt4cb5
             name: resource-templates
           - configMap:
-              name: flyte-admin-config-4fd96h5bd6
+              name: flyte-admin-config-fh8cdtgk68
             name: config-volume
           - name: db-pass
             secret:

diff --git a/deployment/gcp/flyte_generated.yaml b/deployment/gcp/flyte_generated.yaml
@@ -8139,9 +8139,6 @@ data:
     logger:
       show-source: true
       level: 2
-  remote_data.yaml: |
-    remoteData:
-      scheme: "gcp"
   server.yaml: |
     server:
       httpPort: 8088
@@ -8186,14 +8183,6 @@ data:
           clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
     flyteadmin:
       roleNameKey: "iam.amazonaws.com/role"
-      profilerPort: 10254
-      metricsScope: "flyte:"
-      metadataStoragePrefix:
-        - "metadata"
-        - "admin"
-      eventVersion: 1
-      testing:
-        host: http://flyteadmin
   storage.yaml: |
     storage:
       type: stow
@@ -8227,7 +8216,7 @@ data:
         gpu: 1
 kind: ConfigMap
 metadata:
-  name: flyte-admin-config-7bk9bgt47c
+  name: flyte-admin-config-2gh2k52tb8
   namespace: flyte
 ---
 apiVersion: v1
@@ -8785,7 +8774,7 @@ spec:
       labels:
         app: flyteadmin
         app.kubernetes.io/name: flyteadmin
-        app.kubernetes.io/version: 0.3.38
+        app.kubernetes.io/version: 0.4.13
     spec:
       containers:
       - command:
@@ -8902,7 +8891,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: flyte-admin-config-7bk9bgt47c
+          name: flyte-admin-config-2gh2k52tb8
         name: config-volume
       - configMap:
           name: clusterresource-template-tkdkkt4cb5
@@ -9190,7 +9179,7 @@ spec:
               name: clusterresource-template-tkdkkt4cb5
             name: resource-templates
           - configMap:
-              name: flyte-admin-config-7bk9bgt47c
+              name: flyte-admin-config-2gh2k52tb8
             name: config-volume
           - name: db-pass
             secret:

diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
@@ -2152,12 +2152,6 @@ data:
     logger:
       show-source: true
       level: 2
-  remote_data.yaml: |
-    remoteData:
-      region: "us-east-1"
-      scheme: "local"
-      signedUrls:
-        durationMinutes: 3
   server.yaml: |
     server:
       httpPort: 8088
@@ -2202,14 +2196,6 @@ data:
           clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
     flyteadmin:
       roleNameKey: "iam.amazonaws.com/role"
-      profilerPort: 10254
-      metricsScope: "flyte:"
-      metadataStoragePrefix:
-        - "metadata"
-        - "admin"
-      eventVersion: 1
-      testing:
-        host: http://flyteadmin
   storage.yaml: |+
     storage:
       type: minio
@@ -2235,7 +2221,7 @@ data:
         gpu: 1
 kind: ConfigMap
 metadata:
-  name: flyte-admin-config-d8gthbmdg5
+  name: flyte-admin-config-cbf8chmd2t
   namespace: flyte
 ---
 apiVersion: v1
@@ -2889,7 +2875,7 @@ spec:
       labels:
         app: flyteadmin
         app.kubernetes.io/name: flyteadmin
-        app.kubernetes.io/version: 0.3.38
+        app.kubernetes.io/version: 0.4.13
     spec:
       containers:
       - command:
@@ -3014,7 +3000,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: flyte-admin-config-d8gthbmdg5
+          name: flyte-admin-config-cbf8chmd2t
         name: config-volume
       - name: db-pass
         secret:
@@ -3426,7 +3412,7 @@ spec:
               name: clusterresource-template-dtg8ff28mt
             name: resource-templates
           - configMap:
-              name: flyte-admin-config-d8gthbmdg5
+              name: flyte-admin-config-cbf8chmd2t
             name: config-volume
           - name: db-pass
             secret:

diff --git a/deployment/test/flyte_generated.yaml b/deployment/test/flyte_generated.yaml
@@ -300,12 +300,6 @@ data:
     logger:
       show-source: true
       level: 2
-  remote_data.yaml: |
-    remoteData:
-      region: "us-east-1"
-      scheme: "local"
-      signedUrls:
-        durationMinutes: 3
   server.yaml: |
     server:
       httpPort: 8088
@@ -350,14 +344,6 @@ data:
           clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
     flyteadmin:
       roleNameKey: "iam.amazonaws.com/role"
-      profilerPort: 10254
-      metricsScope: "flyte:"
-      metadataStoragePrefix:
-        - "metadata"
-        - "admin"
-      eventVersion: 1
-      testing:
-        host: http://flyteadmin
   storage.yaml: |+
     storage:
       type: minio
@@ -383,7 +369,7 @@ data:
         gpu: 1
 kind: ConfigMap
 metadata:
-  name: flyte-admin-config-cm5bh86k8m
+  name: flyte-admin-config-t8ct89hdm5
   namespace: flyte
 ---
 apiVersion: v1
@@ -743,7 +729,7 @@ spec:
       labels:
         app: flyteadmin
         app.kubernetes.io/name: flyteadmin
-        app.kubernetes.io/version: 0.3.38
+        app.kubernetes.io/version: 0.4.13
     spec:
       containers:
       - command:
@@ -868,7 +854,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: flyte-admin-config-cm5bh86k8m
+          name: flyte-admin-config-t8ct89hdm5
         name: config-volume
       - name: db-pass
         secret:

diff --git a/kustomize/base/admindeployment/clustersync/cron.yaml b/kustomize/base/admindeployment/clustersync/cron.yaml
@@ -12,7 +12,7 @@ spec:
           serviceAccountName: flyteadmin
           containers:
           - name: sync-cluster-resources
-            image: flyteadmin:v0.3.29
+            image: flyteadmin:v0.4.13
             imagePullPolicy: IfNotPresent
             command: ["flyteadmin", "--config", "/etc/flyte/config/*.yaml", "clusterresource", "sync"]
             volumeMounts:

diff --git a/kustomize/base/admindeployment/deployment.yaml b/kustomize/base/admindeployment/deployment.yaml
@@ -16,7 +16,7 @@ spec:
       labels:
         app: flyteadmin
         app.kubernetes.io/name: flyteadmin
-        app.kubernetes.io/version: 0.3.38
+        app.kubernetes.io/version: 0.4.13
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "10254"

diff --git a/kustomize/base/single_cluster/headless/config/admin/remote_data.yaml b/kustomize/base/single_cluster/headless/config/admin/remote_data.yaml
diff --git a/kustomize/base/single_cluster/headless/config/admin/server.yaml b/kustomize/base/single_cluster/headless/config/admin/server.yaml
@@ -41,11 +41,3 @@ auth:
       clientId: 657465813211-6eog7ek7li5k7i7fvgv2921075063hpe.apps.googleusercontent.com
 flyteadmin:
   roleNameKey: "iam.amazonaws.com/role"
-  profilerPort: 10254
-  metricsScope: "flyte:"
-  metadataStoragePrefix:
-    - "metadata"
-    - "admin"
-  eventVersion: 1
-  testing:
-    host: http://flyteadmin
diff --git a/kustomize/base/single_cluster/headless/kustomization.yaml b/kustomize/base/single_cluster/headless/kustomization.yaml
@@ -19,7 +19,6 @@ configMapGenerator:
       - ./config/admin/domain.yaml
       - ./config/admin/db.yaml
       - ./config/admin/cluster_resources.yaml
-      - ./config/admin/remote_data.yaml
       - ./config/admin/task_resource_defaults.yaml
       - ./config/common/storage.yaml
       - ./config/common/logger.yaml

diff --git a/kustomize/overlays/eks/flyte/config/admin/remote_data.yaml b/kustomize/overlays/eks/flyte/config/admin/remote_data.yaml
diff --git a/kustomize/overlays/eks/flyte/kustomization.yaml b/kustomize/overlays/eks/flyte/kustomization.yaml
@@ -27,7 +27,6 @@ configMapGenerator:
   - behavior: merge
     files:
       - ./config/admin/db.yaml
-      - ./config/admin/remote_data.yaml
       - ./config/admin/task_resource_defaults.yaml
       - ./config/common/storage.yaml
     name: flyte-admin-config

diff --git a/kustomize/overlays/eks/kustomization.yaml b/kustomize/overlays/eks/kustomization.yaml
@@ -38,4 +38,4 @@ images:
   # Webhook
   - name: webhook # match images with this name
     newTag: v0.10.6 # FLYTEPROPELLER_TAG override the tag
-    newName: ghcr.io/flyteorg/flytepropeller # override the name
+    newName: ghcr.io/flyteorg/flytepropeller # override the name
diff --git a/kustomize/overlays/gcp/flyte/config/admin/remote_data.yaml b/kustomize/overlays/gcp/flyte/config/admin/remote_data.yaml
diff --git a/kustomize/overlays/gcp/flyte/kustomization.yaml b/kustomize/overlays/gcp/flyte/kustomization.yaml
@@ -24,7 +24,6 @@ configMapGenerator:
 - behavior: merge
   files:
   - ./config/admin/db.yaml
-  - ./config/admin/remote_data.yaml
   - ./config/admin/task_resource_defaults.yaml
   - ./config/common/storage.yaml
   name: flyte-admin-config

diff --git a/kustomize/overlays/gcp/kustomization.yaml b/kustomize/overlays/gcp/kustomization.yaml
@@ -40,4 +40,4 @@ images:
   # Webhook
   - name: webhook # match images with this name
     newTag: v0.10.6 # FLYTEPROPELLER_TAG override the tag
-    newName: ghcr.io/flyteorg/flytepropeller # override the name
+    newName: ghcr.io/flyteorg/flytepropeller # override the name
diff --git a/kustomize/overlays/sandbox/flyte/admin/deployment.yaml b/kustomize/overlays/sandbox/flyte/admin/deployment.yaml
@@ -20,7 +20,7 @@ spec:
               do echo waiting for database; sleep 2; done;",
             ]
         - name: run-migrations
-          image: flyteadmin:v0.4.0
+          image: flyteadmin:v0.4.13
           imagePullPolicy: IfNotPresent
           command:
             [
@@ -34,7 +34,7 @@ spec:
             - name: config-volume
               mountPath: /etc/flyte/config
         - name: seed-projects
-          image: flyteadmin:v0.4.0
+          image: flyteadmin:v0.4.13
           imagePullPolicy: IfNotPresent
           command:
             [
@@ -50,7 +50,7 @@ spec:
             - name: config-volume
               mountPath: /etc/flyte/config
         - name: sync-cluster-resources
-          image: flyteadmin:v0.4.0
+          image: flyteadmin:v0.4.13
           imagePullPolicy: IfNotPresent
           command:
             [

diff --git a/kustomize/overlays/test/flyte/admin/deployment.yaml b/kustomize/overlays/test/flyte/admin/deployment.yaml
@@ -17,23 +17,23 @@ spec:
           'until pg_isready -h postgres -p 5432;
           do echo waiting for database; sleep 2; done;']
       - name: run-migrations
-        image: flyteadmin:v0.3.5
+        image: flyteadmin:v0.4.13
         imagePullPolicy: IfNotPresent
         command: ["flyteadmin", "--config", "/etc/flyte/config/*.yaml",
                   "migrate", "run"]
         volumeMounts:
         - name: config-volume
           mountPath: /etc/flyte/config
       - name: seed-projects
-        image: flyteadmin:v0.3.5
+        image: flyteadmin:v0.4.13
         imagePullPolicy: IfNotPresent
         command: ["flyteadmin", "--config", "/etc/flyte/config/*.yaml",
                   "migrate", "seed-projects", "flytetester", "flytesnacks"]
         volumeMounts:
         - name: config-volume
           mountPath: /etc/flyte/config
       - name: sync-cluster-resources
-        image: flyteadmin:v0.3.5
+        image: flyteadmin:v0.4.13
         imagePullPolicy: IfNotPresent
         command: ["flyteadmin", "--config", "/etc/flyte/config/*.yaml", "clusterresource", "sync"]
         volumeMounts: