From 4b6deaebb0026a538d64409dbac687e68f764af7 Mon Sep 17 00:00:00 2001 From: trisberg Date: Thu, 26 Sep 2024 08:52:34 -0400 Subject: [PATCH] Remove Tiltfile and workload.yaml --- .../where-for-dinner-api-gateway/Tiltfile | 23 --------- .../config/workload.yaml | 31 ------------ .../where-for-dinner-availability/Tiltfile | 23 --------- .../config/workload.yaml | 38 --------------- .../where-for-dinner-crawler-python/Tiltfile | 27 ----------- .../config/workload.yaml | 29 ------------ .../config/workload.yaml | 34 -------------- .../where-for-dinner-notify/Tiltfile | 23 --------- .../config/workload.yaml | 38 --------------- .../where-for-dinner-search-proc/Tiltfile | 23 --------- .../config/workload.yaml | 38 --------------- .../where-for-dinner-search/Tiltfile | 23 --------- .../config/workload.yaml | 47 ------------------- .../where-for-dinner-ui/config/workload.yaml | 33 ------------- 14 files changed, 430 deletions(-) delete mode 100644 where-for-dinner/where-for-dinner-api-gateway/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-api-gateway/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-availability/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-availability/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-crawler-python/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-crawler-python/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-crawler/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-notify/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-notify/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-search-proc/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-search-proc/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-search/Tiltfile delete mode 100644 where-for-dinner/where-for-dinner-search/config/workload.yaml delete mode 100644 where-for-dinner/where-for-dinner-ui/config/workload.yaml diff --git a/where-for-dinner/where-for-dinner-api-gateway/Tiltfile b/where-for-dinner/where-for-dinner-api-gateway/Tiltfile deleted file mode 100644 index 001467a27..000000000 --- a/where-for-dinner/where-for-dinner-api-gateway/Tiltfile +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes" , - deps=['pom.xml', './target/classes'], - container_selector='workload', - live_update=[ - sync('./target/classes', '/workspace/BOOT-INF/classes') - ] -) - -k8s_resource('where-for-dinner', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-api-gateway/config/workload.yaml b/where-for-dinner/where-for-dinner-api-gateway/config/workload.yaml deleted file mode 100644 index ad37201c4..000000000 --- a/where-for-dinner/where-for-dinner-api-gateway/config/workload.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner - labels: - apps.tanzu.vmware.com/workload-type: web - apps.tanzu.vmware.com/has-tests: "true" - app.kubernetes.io/part-of: where-for-dinner-api-gateway - apps.tanzu.vmware.com/auto-configure-actuators: "true" -spec: - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - build: - env: - - name: BP_JVM_VERSION - value: "21" - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-api-gateway \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-availability/Tiltfile b/where-for-dinner/where-for-dinner-availability/Tiltfile deleted file mode 100644 index 2a89ee72c..000000000 --- a/where-for-dinner/where-for-dinner-availability/Tiltfile +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner-availability', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes" , - deps=['pom.xml', './target/classes'], - container_selector='workload', - live_update=[ - sync('./target/classes', '/workspace/BOOT-INF/classes') - ] -) - -k8s_resource('where-for-dinner-availability', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner-availability', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-availability/config/workload.yaml b/where-for-dinner/where-for-dinner-availability/config/workload.yaml deleted file mode 100644 index 8fbaa93ac..000000000 --- a/where-for-dinner/where-for-dinner-availability/config/workload.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-availability - labels: - apps.tanzu.vmware.com/workload-type: web - apps.tanzu.vmware.com/has-tests: "true" - app.kubernetes.io/part-of: where-for-dinner-availability - apps.tanzu.vmware.com/auto-configure-actuators: "true" - networking.knative.dev/visibility: cluster-local -spec: - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1.5" - build: - env: - - name: BP_JVM_VERSION - value: "21" - serviceClaims: - - name: rmq - ref: - apiVersion: services.apps.tanzu.vmware.com/v1alpha1 - kind: ClassClaim - name: msgbroker-where-for-dinner - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-availability \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-crawler-python/Tiltfile b/where-for-dinner/where-for-dinner-crawler-python/Tiltfile deleted file mode 100644 index ae806f276..000000000 --- a/where-for-dinner/where-for-dinner-crawler-python/Tiltfile +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner-crawler', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes", - deps=[''], - container_selector='workload', - live_update=[ - sync('.', '/workspace/'), - run( - 'pip install -r /workspace/requirements.txt', - trigger=['./workspace/requirements.txt'] - ) - ] -) - -k8s_resource('where-for-dinner-crawler', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner-crawler', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-crawler-python/config/workload.yaml b/where-for-dinner/where-for-dinner-crawler-python/config/workload.yaml deleted file mode 100644 index f2e20e872..000000000 --- a/where-for-dinner/where-for-dinner-crawler-python/config/workload.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-crawler - labels: - apps.tanzu.vmware.com/workload-type: server - app.kubernetes.io/part-of: where-for-dinner-crawler - networking.knative.dev/visibility: cluster-local - apps.tanzu.vmware.com/has-tests: "true" -spec: - params: - - name: ports - value: - - port: 8080 - containerPort: 8080 - name: http - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-crawler-python diff --git a/where-for-dinner/where-for-dinner-crawler/config/workload.yaml b/where-for-dinner/where-for-dinner-crawler/config/workload.yaml deleted file mode 100644 index 537f3eeb2..000000000 --- a/where-for-dinner/where-for-dinner-crawler/config/workload.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-crawler - labels: - apps.tanzu.vmware.com/workload-type: server - apps.tanzu.vmware.com/has-tests: "true" - apps.tanzu.vmware.com/auto-configure-actuators: "true" - app.kubernetes.io/part-of: where-for-dinner-crawler - networking.knative.dev/visibility: cluster-local -spec: - params: - - name: ports - value: - - port: 8080 - containerPort: 8080 - name: http - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - build: - env: - - name: BP_JVM_VERSION - value: "21" - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-crawler \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-notify/Tiltfile b/where-for-dinner/where-for-dinner-notify/Tiltfile deleted file mode 100644 index e8dd1eed3..000000000 --- a/where-for-dinner/where-for-dinner-notify/Tiltfile +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner-notify', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes" , - deps=['pom.xml', './target/classes'], - container_selector='workload', - live_update=[ - sync('./target/classes', '/workspace/BOOT-INF/classes') - ] -) - -k8s_resource('where-for-dinner-notify', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner-notify', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-notify/config/workload.yaml b/where-for-dinner/where-for-dinner-notify/config/workload.yaml deleted file mode 100644 index df039c563..000000000 --- a/where-for-dinner/where-for-dinner-notify/config/workload.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-notify - labels: - apps.tanzu.vmware.com/workload-type: web - apps.tanzu.vmware.com/has-tests: "true" - apps.tanzu.vmware.com/auto-configure-actuators: "true" - app.kubernetes.io/part-of: where-for-dinner-notify - networking.knative.dev/visibility: cluster-local -spec: - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - build: - env: - - name: BP_JVM_VERSION - value: "21" - serviceClaims: - - name: rmq - ref: - apiVersion: services.apps.tanzu.vmware.com/v1alpha1 - kind: ClassClaim - name: msgbroker-where-for-dinner - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-notify \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-search-proc/Tiltfile b/where-for-dinner/where-for-dinner-search-proc/Tiltfile deleted file mode 100644 index 99529daa6..000000000 --- a/where-for-dinner/where-for-dinner-search-proc/Tiltfile +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner-search-proc', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes" , - deps=['pom.xml', './target/classes'], - container_selector='workload', - live_update=[ - sync('./target/classes', '/workspace/BOOT-INF/classes') - ] -) - -k8s_resource('where-for-dinner-search-proc', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner-search-proc', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-search-proc/config/workload.yaml b/where-for-dinner/where-for-dinner-search-proc/config/workload.yaml deleted file mode 100644 index 8a5093c66..000000000 --- a/where-for-dinner/where-for-dinner-search-proc/config/workload.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-search-proc - labels: - apps.tanzu.vmware.com/workload-type: web - apps.tanzu.vmware.com/has-tests: "true" - apps.tanzu.vmware.com/auto-configure-actuators: "true" - app.kubernetes.io/part-of: where-for-dinner-search-proc - networking.knative.dev/visibility: cluster-local -spec: - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - build: - env: - - name: BP_JVM_VERSION - value: "21" - serviceClaims: - - name: rmq - ref: - apiVersion: services.apps.tanzu.vmware.com/v1alpha1 - kind: ClassClaim - name: msgbroker-where-for-dinner - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-search-proc \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-search/Tiltfile b/where-for-dinner/where-for-dinner-search/Tiltfile deleted file mode 100644 index e28aaffc4..000000000 --- a/where-for-dinner/where-for-dinner-search/Tiltfile +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH = os.getenv("LOCAL_PATH", default='.') -NAMESPACE = os.getenv("NAMESPACE", default='default') -WAIT_TIMEOUT = os.getenv("WAIT_TIMEOUT", default='10m00s') -TYPE = os.getenv("TYPE", default='web') - -k8s_custom_deploy( - 'where-for-dinner-search', - apply_cmd="tanzu apps workload apply -f config/workload.yaml --update-strategy replace --debug --live-update" + - " --local-path " + LOCAL_PATH + - " --namespace " + NAMESPACE + - " --wait-timeout " + WAIT_TIMEOUT + - " --type " + TYPE + - " --yes --output yaml", - delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes" , - deps=['pom.xml', './target/classes'], - container_selector='workload', - live_update=[ - sync('./target/classes', '/workspace/BOOT-INF/classes') - ] -) - -k8s_resource('where-for-dinner-search', port_forwards=["8080:8080"], - extra_pod_selectors=[{'carto.run/workload-name': 'where-for-dinner-search', 'app.kubernetes.io/component': 'run'}]) diff --git a/where-for-dinner/where-for-dinner-search/config/workload.yaml b/where-for-dinner/where-for-dinner-search/config/workload.yaml deleted file mode 100644 index 8e428820d..000000000 --- a/where-for-dinner/where-for-dinner-search/config/workload.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - name: where-for-dinner-search - labels: - apps.tanzu.vmware.com/workload-type: web - apps.tanzu.vmware.com/has-tests: "true" - apps.tanzu.vmware.com/auto-configure-actuators: "true" - app.kubernetes.io/part-of: where-for-dinner-search - networking.knative.dev/visibility: cluster-local - apis.apps.tanzu.vmware.com/register-api: "true" -spec: - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - - name: api_descriptor - value: - type: openapi - location: - path: "/v3/api-docs" - owner: where-for-dinner-team - system: where-for-dinner - description: Where For Dinner Search API - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - build: - env: - - name: BP_JVM_VERSION - value: "21" - serviceClaims: - - name: rmq - ref: - apiVersion: services.apps.tanzu.vmware.com/v1alpha1 - kind: ClassClaim - name: msgbroker-where-for-dinner - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-search \ No newline at end of file diff --git a/where-for-dinner/where-for-dinner-ui/config/workload.yaml b/where-for-dinner/where-for-dinner-ui/config/workload.yaml deleted file mode 100644 index 1c9fa8f3c..000000000 --- a/where-for-dinner/where-for-dinner-ui/config/workload.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: carto.run/v1alpha1 -kind: Workload -metadata: - labels: - app.kubernetes.io/part-of: where-for-dinner-ui - apps.tanzu.vmware.com/has-tests: "true" - apps.tanzu.vmware.com/workload-type: web - networking.knative.dev/visibility: cluster-local - name: where-for-dinner-ui -spec: - build: - env: - - name: BP_NODE_RUN_SCRIPTS - value: build - - name: BP_WEB_SERVER_ROOT - value: dist - params: - - name: annotations - value: - autoscaling.knative.dev/minScale: "1" - resources: - requests: - memory: "500M" - cpu: "100m" - limits: - memory: "750M" - cpu: "1500m" - source: - git: - url: - ref: - branch: main - subPath: where-for-dinner-ui