Skip to content

Commit

Permalink
Merge pull request #119 from ytsarev/xnetwork-split
Browse files Browse the repository at this point in the history
XNetwork split
  • Loading branch information
ytsarev authored Oct 17, 2023
2 parents c812be5 + c9193cf commit 2c0c5aa
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 534 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ PLATFORMS ?= linux_amd64
# ====================================================================================
# Setup Kubernetes tools

UP_VERSION = v0.19.1
UP_VERSION = v0.21.0
UP_CHANNEL = stable
UPTEST_VERSION = v0.5.0
UPTEST_VERSION = v0.6.1

-include build/makelib/k8s_tools.mk
# ====================================================================================
Expand Down
2 changes: 1 addition & 1 deletion apis/cluster/composition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
kind: XCluster
resources:
- base:
apiVersion: aws.platformref.upbound.io/v1alpha1
apiVersion: aws.platform.upbound.io/v1alpha1
kind: XNetwork
patches:
- fromFieldPath: spec.parameters.id
Expand Down
2 changes: 1 addition & 1 deletion apis/cluster/eks/composition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ spec:
- fromFieldPath: spec.parameters.nodes.instanceType
toFieldPath: spec.forProvider.instanceTypes[0]
- fromFieldPath: spec.parameters.id
toFieldPath: spec.forProvider.subnetIdSelector.matchLabels[networks.aws.platformref.upbound.io/network-id]
toFieldPath: spec.forProvider.subnetIdSelector.matchLabels[networks.aws.platform.upbound.io/network-id]
- name: ebsCsiAddon
base:
apiVersion: eks.aws.upbound.io/v1beta1
Expand Down
Loading

0 comments on commit 2c0c5aa

Please sign in to comment.