Skip to content

Commit

Permalink
./hack/update-expected.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@rifelpet
rifelpet committed Sep 17, 2021
1 parent 5f058f0 commit f3c9f27
Show file tree
Hide file tree
Showing 53 changed files with 1,341 additions and 165 deletions.
33 changes: 30 additions & 3 deletions tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ provider "aws" {
region = "us-test-1"
}

provider "aws" {
alias = "files"
region = "us-test-1"
}

resource "aws_autoscaling_group" "master-us-test-1a-masters-minimal-example-com" {
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
launch_template {
Expand Down Expand Up @@ -559,146 +564,167 @@ resource "aws_s3_bucket_object" "cluster-completed-spec" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_cluster-completed.spec_content")
key = "clusters.example.com/minimal.example.com/cluster-completed.spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "discovery-json" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_discovery.json_content")
key = "discovery.example.com/minimal.example.com/.well-known/openid-configuration"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "etcd-cluster-spec-events" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_etcd-cluster-spec-events_content")
key = "clusters.example.com/minimal.example.com/backups/etcd/events/control/etcd-cluster-spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "etcd-cluster-spec-main" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_etcd-cluster-spec-main_content")
key = "clusters.example.com/minimal.example.com/backups/etcd/main/control/etcd-cluster-spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "keys-json" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_keys.json_content")
key = "discovery.example.com/minimal.example.com/openid/v1/jwks"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "kops-version-txt" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_kops-version.txt_content")
key = "clusters.example.com/minimal.example.com/kops-version.txt"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-etcdmanager-events" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-etcdmanager-events_content")
key = "clusters.example.com/minimal.example.com/manifests/etcd/events.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-etcdmanager-main" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-etcdmanager-main_content")
key = "clusters.example.com/minimal.example.com/manifests/etcd/main.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-static-kube-apiserver-healthcheck" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content")
key = "clusters.example.com/minimal.example.com/manifests/static/kube-apiserver-healthcheck.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-aws-load-balancer-controller-addons-k8s-io-k8s-1-9" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.9_content")
key = "clusters.example.com/minimal.example.com/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.9.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-bootstrap" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content")
key = "clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-certmanager-io-k8s-1-16" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content")
key = "clusters.example.com/minimal.example.com/addons/certmanager.io/k8s-1.16.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-core-addons-k8s-io" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-core.addons.k8s.io_content")
key = "clusters.example.com/minimal.example.com/addons/core.addons.k8s.io/v1.4.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-coredns-addons-k8s-io-k8s-1-12" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content")
key = "clusters.example.com/minimal.example.com/addons/coredns.addons.k8s.io/k8s-1.12.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-dns-controller-addons-k8s-io-k8s-1-12" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content")
key = "clusters.example.com/minimal.example.com/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-kops-controller-addons-k8s-io-k8s-1-16" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content")
key = "clusters.example.com/minimal.example.com/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-kubelet-api-rbac-addons-k8s-io-k8s-1-9" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content")
key = "clusters.example.com/minimal.example.com/addons/kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-limit-range-addons-k8s-io" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-limit-range.addons.k8s.io_content")
key = "clusters.example.com/minimal.example.com/addons/limit-range.addons.k8s.io/v1.5.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "minimal-example-com-addons-storage-aws-addons-k8s-io-v1-15-0" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_minimal.example.com-addons-storage-aws.addons.k8s.io-v1.15.0_content")
key = "clusters.example.com/minimal.example.com/addons/storage-aws.addons.k8s.io/v1.15.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "nodeupconfig-master-us-test-1a" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content")
key = "clusters.example.com/minimal.example.com/igconfig/master/master-us-test-1a/nodeupconfig.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "nodeupconfig-nodes" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_nodeupconfig-nodes_content")
key = "clusters.example.com/minimal.example.com/igconfig/node/nodes/nodeupconfig.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

Expand Down Expand Up @@ -892,11 +918,12 @@ resource "aws_vpc_dhcp_options_association" "minimal-example-com" {
}

terraform {
required_version = ">= 0.12.26"
required_version = ">= 0.15.0"
required_providers {
aws = {
"source" = "hashicorp/aws"
"version" = ">= 3.59.0"
"configuration_aliases" = [aws.files]
"source" = "hashicorp/aws"
"version" = ">= 3.59.0"
}
}
}
30 changes: 27 additions & 3 deletions tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ provider "aws" {
region = "us-test-1"
}

provider "aws" {
alias = "files"
region = "us-test-1"
}

resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
launch_template {
Expand Down Expand Up @@ -768,125 +773,143 @@ resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-bootstrap" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-core-addons-k8s-io" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-core.addons.k8s.io_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/core.addons.k8s.io/v1.4.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-coredns-addons-k8s-io-k8s-1-12" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/coredns.addons.k8s.io/k8s-1.12.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-dns-controller-addons-k8s-io-k8s-1-12" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-kops-controller-addons-k8s-io-k8s-1-16" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-kubelet-api-rbac-addons-k8s-io-k8s-1-9" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-limit-range-addons-k8s-io" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-limit-range.addons.k8s.io_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/limit-range.addons.k8s.io/v1.5.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "bastionuserdata-example-com-addons-storage-aws-addons-k8s-io-v1-15-0" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-storage-aws.addons.k8s.io-v1.15.0_content")
key = "clusters.example.com/bastionuserdata.example.com/addons/storage-aws.addons.k8s.io/v1.15.0.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "cluster-completed-spec" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_cluster-completed.spec_content")
key = "clusters.example.com/bastionuserdata.example.com/cluster-completed.spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "etcd-cluster-spec-events" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_etcd-cluster-spec-events_content")
key = "clusters.example.com/bastionuserdata.example.com/backups/etcd/events/control/etcd-cluster-spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "etcd-cluster-spec-main" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_etcd-cluster-spec-main_content")
key = "clusters.example.com/bastionuserdata.example.com/backups/etcd/main/control/etcd-cluster-spec"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "kops-version-txt" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_kops-version.txt_content")
key = "clusters.example.com/bastionuserdata.example.com/kops-version.txt"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-etcdmanager-events" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-etcdmanager-events_content")
key = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-etcdmanager-main" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-etcdmanager-main_content")
key = "clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "manifests-static-kube-apiserver-healthcheck" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content")
key = "clusters.example.com/bastionuserdata.example.com/manifests/static/kube-apiserver-healthcheck.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "nodeupconfig-bastion" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_nodeupconfig-bastion_content")
key = "clusters.example.com/bastionuserdata.example.com/igconfig/bastion/bastion/nodeupconfig.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "nodeupconfig-master-us-test-1a" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content")
key = "clusters.example.com/bastionuserdata.example.com/igconfig/master/master-us-test-1a/nodeupconfig.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

resource "aws_s3_bucket_object" "nodeupconfig-nodes" {
bucket = "testingBucket"
content = file("${path.module}/data/aws_s3_bucket_object_nodeupconfig-nodes_content")
key = "clusters.example.com/bastionuserdata.example.com/igconfig/node/nodes/nodeupconfig.yaml"
provider = aws.files
server_side_encryption = "AES256"
}

Expand Down Expand Up @@ -1215,11 +1238,12 @@ resource "aws_vpc_dhcp_options_association" "bastionuserdata-example-com" {
}

terraform {
required_version = ">= 0.12.26"
required_version = ">= 0.15.0"
required_providers {
aws = {
"source" = "hashicorp/aws"
"version" = ">= 3.59.0"
"configuration_aliases" = [aws.files]
"source" = "hashicorp/aws"
"version" = ">= 3.59.0"
}
}
}
6 changes: 6 additions & 0 deletions ...tegration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@ spec:
name: us-east-1a-utility
type: Utility
zone: us-test-1a
target:
terraform:
filesProviderExtraConfig:
profile: foo
providerExtraConfig:
max_retries: "10"
topology:
dns:
type: Public
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ spec:
sshAccess:
- 1.1.1.1/32
sshKeyName: ""
target:
terraform:
providerExtraConfig:
max_retries: "10"
filesProviderExtraConfig:
profile: "foo"
topology:
masters: public
nodes: public
Expand Down
Loading

0 comments on commit f3c9f27

Please sign in to comment.