Fix ecs 1.7.1

mhoshi-vm · Dec 9, 2023 · 6e6eacd · 6e6eacd
1 parent ad38ab6
commit 6e6eacd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 34 deletions.
diff --git a/manifests/tap-ecs-supplychain.tanzu.japan.com/1.7.1/crossplane/provider-aws.yaml b/manifests/tap-ecs-supplychain.tanzu.japan.com/1.7.1/crossplane/provider-aws.yaml
@@ -7,7 +7,7 @@ metadata:
     kapp.k14s.io/change-group: "crd"
   name: upbound-provider-aws-ecs
 spec:
-  package: #@ data.values.crossplane.ecs.repo + ":" + data.values.crossplane.tag 
+  package: #@ data.values.crossplane.repo + "/provider-aws-ecs:" + data.values.crossplane.tag
   controllerConfigRef:
     name: upbound-provider-aws
 ---
@@ -18,7 +18,7 @@ metadata:
     kapp.k14s.io/change-group: "crd"
   name: upbound-provider-aws-ec2
 spec:
-  package: #@ data.values.crossplane.ec2.repo + ":" + data.values.crossplane.tag
+  package: #@ data.values.crossplane.repo + "/provider-aws-ec2:" + data.values.crossplane.tag
   controllerConfigRef:
     name: upbound-provider-aws
 ---
@@ -29,6 +29,6 @@ metadata:
     kapp.k14s.io/change-group: "crd"
   name: upbound-provider-aws-elbv2
 spec:
-  package: #@ data.values.crossplane.elbv2.repo + ":" + data.values.crossplane.tag
+  package: #@ data.values.crossplane.repo + "/provider-aws-elbv2:" + data.values.crossplane.tag
   controllerConfigRef:
     name: upbound-provider-aws
diff --git a/manifests/tap-ecs-supplychain.tanzu.japan.com/1.7.1/values.yaml b/manifests/tap-ecs-supplychain.tanzu.japan.com/1.7.1/values.yaml
@@ -8,16 +8,11 @@ backstage:
   image: registry.tanzu.vmware.com/tanzu-application-platform/tap-packages@sha256:29f978561d7d931c9a118c167eae905ce41990131013339aaff10c291ac6c42b
   plugin:
     name: "@mhoshi-vm/plugin-crossplane-aws"
-    version: 0.1.1
+    version: 0.1.2
 
 crossplane:
   tag: v0.45.0
-  ecs:
-   repo: xpkg.upbound.io/upbound/provider-aws-ecs
-  ec2:
-   repo: xpkg.upbound.io/upbound/provider-aws-ec2
-  elbv2:
-   repo: xpkg.upbound.io/upbound/provider-aws-elbv2
+  repo: xpkg.upbound.io/upbound
 
 aws:
   accountId: ""
@@ -27,7 +22,7 @@ aws:
   vpcId: vpc-xxxxx
   alb:
     enabled: true
-    public: true
+    public: false
     subnets:
     - subnet1
   ecs:

diff --git a/packages/tap-ecs-supplychain.tanzu.japan.com/1.7.1.yaml b/packages/tap-ecs-supplychain.tanzu.japan.com/1.7.1.yaml
@@ -38,35 +38,17 @@ spec:
                   default: '@mhoshi-vm/plugin-crossplane-aws'
                 version:
                   type: string
-                  default: 0.1.1
+                  default: 0.1.2
         crossplane:
           type: object
           additionalProperties: false
           properties:
             tag:
               type: string
               default: v0.45.0
-            ecs:
-              type: object
-              additionalProperties: false
-              properties:
-                repo:
-                  type: string
-                  default: xpkg.upbound.io/upbound/provider-aws-ecs
-            ec2:
-              type: object
-              additionalProperties: false
-              properties:
-                repo:
-                  type: string
-                  default: xpkg.upbound.io/upbound/provider-aws-ec2
-            elbv2:
-              type: object
-              additionalProperties: false
-              properties:
-                repo:
-                  type: string
-                  default: xpkg.upbound.io/upbound/provider-aws-elbv2
+            repo:
+              type: string
+              default: xpkg.upbound.io/upbound
         aws:
           type: object
           additionalProperties: false
@@ -95,7 +77,7 @@ spec:
                   default: true
                 public:
                   type: boolean
-                  default: true
+                  default: false
                 subnets:
                   type: array
                   items: