Merge pull request #1 from evekhm/skaffold_v2fix

Skaffold v2fix
GoogleCloudPlatform · Nov 8, 2022 · 956e3cc · 956e3cc
2 parents 89c1930 + c52f4d2
commit 956e3cc
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -59,10 +59,11 @@ export TF_BUCKET_LOCATION="us"
 bash setup/setup_terraform.sh
 ```
 
-Run Terraform apply
+Run Terraform
 
 ```
 cd terraform/environments/dev
+terraform init
 
 # enabling GCP services first.
 terraform apply -target=module.project_services -target=module.service_accounts -auto-approve

diff --git a/cloudrun/queue/skaffold.yaml b/cloudrun/queue/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: queue
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8000
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/adp_ui/skaffold.yaml b/microservices/adp_ui/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta26
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: adp-ui
@@ -23,12 +23,16 @@ build:
     docker:
       dockerfile: Dockerfile
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/dev
 profiles:
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -49,6 +53,8 @@ profiles:
       docker:
         dockerfile: Dockerfile-dev
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/classification_service/skaffold.yaml b/microservices/classification_service/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: classification-service
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8890
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/document_status_service/skaffold.yaml b/microservices/document_status_service/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: document-status-service
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8894
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/extraction_service/skaffold.yaml b/microservices/extraction_service/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: extraction-service
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8892
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/hitl_service/skaffold.yaml b/microservices/hitl_service/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: hitl-service
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8893
 deploy:
+  kubectl: { }
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: { }
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev
diff --git a/microservices/matching_service/skaffold.yaml b/microservices/matching_service/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: matching-service
@@ -39,6 +39,8 @@ portForward:
   port: 80
   localPort: 8895
 deploy:
+  kubectl: {}
+manifests:
   kustomize:
     paths:
     - ./kustomize/minikube
@@ -52,16 +54,22 @@ profiles:
       - image: common
         alias: BASE_IMG
   deploy:
+    kubectl: {}
+  manifests:
     kustomize:
       paths:
       - ./kustomize/custom
 - name: prod_non_cloudbuild
   deploy:
+    kubectl: {}
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
 - name: prod
   deploy:
+    kubectl: {}
+  manifests:
     kustomize:
       paths:
       - ./kustomize/prod
@@ -93,6 +101,8 @@ profiles:
           - '**/*.py'
           - '**/*.json'
   deploy:
+    kubectl: {}
+  manifests:
     kustomize:
       paths:
       - ./kustomize/dev