diff --git a/manifests/claudie/kustomization.yaml b/manifests/claudie/kustomization.yaml index 9bedbb79b..7b3566375 100644 --- a/manifests/claudie/kustomization.yaml +++ b/manifests/claudie/kustomization.yaml @@ -57,18 +57,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: ghcr.io/berops/claudie/ansibler - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/autoscaler-adapter - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/builder - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/claudie-operator - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/kube-eleven - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/kuber - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/manager - newTag: fa48f74-3122 + newTag: 18e1c56-3155 - name: ghcr.io/berops/claudie/terraformer - newTag: fa48f74-3122 + newTag: 18e1c56-3155 diff --git a/manifests/testing-framework/kustomization.yaml b/manifests/testing-framework/kustomization.yaml index fe28ab269..72f7a2d29 100644 --- a/manifests/testing-framework/kustomization.yaml +++ b/manifests/testing-framework/kustomization.yaml @@ -91,4 +91,4 @@ secretGenerator: images: - name: ghcr.io/berops/claudie/testing-framework - newTag: fa48f74-3122 + newTag: 18e1c56-3155 diff --git a/manifests/testing-framework/test-sets/autoscaling-1/1.yaml b/manifests/testing-framework/test-sets/autoscaling-1/1.yaml index b72805c7b..a1d20ac7f 100644 --- a/manifests/testing-framework/test-sets/autoscaling-1/1.yaml +++ b/manifests/testing-framework/test-sets/autoscaling-1/1.yaml @@ -29,7 +29,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: gcp-cmpt-nodes providerSpec: @@ -40,7 +40,7 @@ spec: min: 1 max: 5 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: autoscaling-1 diff --git a/manifests/testing-framework/test-sets/autoscaling-1/2.yaml b/manifests/testing-framework/test-sets/autoscaling-1/2.yaml index 1aa4d2c30..d0705ab97 100644 --- a/manifests/testing-framework/test-sets/autoscaling-1/2.yaml +++ b/manifests/testing-framework/test-sets/autoscaling-1/2.yaml @@ -29,7 +29,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: gcp-cmpt-nodes providerSpec: @@ -38,7 +38,7 @@ spec: zone: europe-west2-a count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: autoscaling-1-new diff --git a/manifests/testing-framework/test-sets/autoscaling-1/3.yaml b/manifests/testing-framework/test-sets/autoscaling-1/3.yaml index 3de3b72f9..984f662c8 100644 --- a/manifests/testing-framework/test-sets/autoscaling-1/3.yaml +++ b/manifests/testing-framework/test-sets/autoscaling-1/3.yaml @@ -29,7 +29,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: gcp-cmpt-nodes providerSpec: @@ -40,7 +40,7 @@ spec: min: 1 max: 5 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/autoscaling-2/1.yaml b/manifests/testing-framework/test-sets/autoscaling-2/1.yaml index 03256d60c..5a548ba68 100644 --- a/manifests/testing-framework/test-sets/autoscaling-2/1.yaml +++ b/manifests/testing-framework/test-sets/autoscaling-2/1.yaml @@ -27,21 +27,21 @@ spec: - name: genesiscloudnp providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 - name: gencloudscaled providerSpec: name: genesiscloud-2 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 autoscaler: min: 1 max: 5 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 labels: test-set: autoscaling-2 diff --git a/manifests/testing-framework/test-sets/autoscaling-2/2.yaml b/manifests/testing-framework/test-sets/autoscaling-2/2.yaml index 5304b1faa..3f24d155a 100644 --- a/manifests/testing-framework/test-sets/autoscaling-2/2.yaml +++ b/manifests/testing-framework/test-sets/autoscaling-2/2.yaml @@ -29,21 +29,21 @@ spec: - name: genesiscloudnp providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 - name: gencloudscaled providerSpec: name: genesiscloud-2 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 autoscaler: min: 1 max: 5 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 labels: test-set: autoscaling-2 diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/1.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/1.yaml index 09c9606d7..0233dff7f 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/1.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/1.yaml @@ -21,7 +21,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -34,7 +34,7 @@ spec: region: fsn1 zone: fsn1-dc14 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 count: 1 labels: diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/2.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/2.yaml index 66b1fe876..03f32b74f 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/2.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/2.yaml @@ -21,7 +21,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -34,7 +34,7 @@ spec: region: fsn1 zone: fsn1-dc14 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 count: 1 labels: diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/3.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/3.yaml index 09c9606d7..0233dff7f 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/3.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/3.yaml @@ -21,7 +21,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -34,7 +34,7 @@ spec: region: fsn1 zone: fsn1-dc14 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 count: 1 labels: diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/4.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/4.yaml index 629746bcb..b3752d577 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/4.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/4.yaml @@ -21,7 +21,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -34,7 +34,7 @@ spec: region: fsn1 zone: fsn1-dc14 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 count: 1 labels: diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/5.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/5.yaml index 07cbdddae..08a870af7 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/5.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/5.yaml @@ -29,7 +29,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -43,7 +43,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-with-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/6.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/6.yaml index 5ee66961c..1dca81810 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/6.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/6.yaml @@ -29,7 +29,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -43,7 +43,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-with-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/7.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/7.yaml index 1233bc96d..294d1b205 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/7.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/7.yaml @@ -29,7 +29,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -43,7 +43,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-with-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-with-hetzner/8.yaml b/manifests/testing-framework/test-sets/proxy-with-hetzner/8.yaml index 248fa214e..a9711dedc 100644 --- a/manifests/testing-framework/test-sets/proxy-with-hetzner/8.yaml +++ b/manifests/testing-framework/test-sets/proxy-with-hetzner/8.yaml @@ -29,7 +29,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 labels: test-set: proxy-with-hetzner @@ -42,7 +42,7 @@ spec: region: fsn1 zone: fsn1-dc14 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 count: 1 labels: diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/1.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/1.yaml index 03811a5bb..c4ff137da 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/1.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/1.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/10.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/10.yaml index 933745111..1ec14dc50 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/10.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/10.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/2.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/2.yaml index e92cc856f..d02325ea7 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/2.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/2.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/3.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/3.yaml index 03811a5bb..c4ff137da 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/3.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/3.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/4.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/4.yaml index c143bda11..72e3fe473 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/4.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/4.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/5.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/5.yaml index e92cc856f..d02325ea7 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/5.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/5.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/6.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/6.yaml index 67a47a9c3..23bda6483 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/6.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/6.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/7.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/7.yaml index 30f6a8fce..95512b37c 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/7.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/7.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/8.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/8.yaml index c143bda11..72e3fe473 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/8.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/8.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/proxy-without-hetzner/9.yaml b/manifests/testing-framework/test-sets/proxy-without-hetzner/9.yaml index 03811a5bb..c4ff137da 100644 --- a/manifests/testing-framework/test-sets/proxy-without-hetzner/9.yaml +++ b/manifests/testing-framework/test-sets/proxy-without-hetzner/9.yaml @@ -21,7 +21,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: proxy-without-hetzner annotations: @@ -34,7 +34,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: proxy-without-hetzner diff --git a/manifests/testing-framework/test-sets/rolling-update-2/1.yaml b/manifests/testing-framework/test-sets/rolling-update-2/1.yaml index 9267da470..bc3f051f4 100644 --- a/manifests/testing-framework/test-sets/rolling-update-2/1.yaml +++ b/manifests/testing-framework/test-sets/rolling-update-2/1.yaml @@ -83,8 +83,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-cmpt-nodes @@ -95,16 +95,16 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-03c476a1ca8e3ebdc + image: ami-045a8ab02aadf4f88 storageDiskSize: 50 - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/rolling-update-2/2.yaml b/manifests/testing-framework/test-sets/rolling-update-2/2.yaml index bd7d8d7fc..c6beeaa0b 100644 --- a/manifests/testing-framework/test-sets/rolling-update-2/2.yaml +++ b/manifests/testing-framework/test-sets/rolling-update-2/2.yaml @@ -47,7 +47,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-03c476a1ca8e3ebdc + image: ami-045a8ab02aadf4f88 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/rolling-update/1.yaml b/manifests/testing-framework/test-sets/rolling-update/1.yaml index a2bc323a3..12f70481a 100644 --- a/manifests/testing-framework/test-sets/rolling-update/1.yaml +++ b/manifests/testing-framework/test-sets/rolling-update/1.yaml @@ -66,8 +66,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: azr-ctrl-nodes @@ -87,10 +87,10 @@ spec: - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/rolling-update/2.yaml b/manifests/testing-framework/test-sets/rolling-update/2.yaml index df05303b0..7ba851d16 100644 --- a/manifests/testing-framework/test-sets/rolling-update/2.yaml +++ b/manifests/testing-framework/test-sets/rolling-update/2.yaml @@ -66,8 +66,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: azr-ctrl-nodes @@ -87,10 +87,10 @@ spec: - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/succeeds-on-last-1/2.yaml b/manifests/testing-framework/test-sets/succeeds-on-last-1/2.yaml index 023a074f0..8c5c95aeb 100644 --- a/manifests/testing-framework/test-sets/succeeds-on-last-1/2.yaml +++ b/manifests/testing-framework/test-sets/succeeds-on-last-1/2.yaml @@ -22,7 +22,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-03c476a1ca8e3ebdc + image: ami-045a8ab02aadf4f88 storageDiskSize: 50 kubernetes: clusters: diff --git a/manifests/testing-framework/test-sets/succeeds-on-last-2/2.yaml b/manifests/testing-framework/test-sets/succeeds-on-last-2/2.yaml index 63266607d..520e99fe9 100644 --- a/manifests/testing-framework/test-sets/succeeds-on-last-2/2.yaml +++ b/manifests/testing-framework/test-sets/succeeds-on-last-2/2.yaml @@ -38,7 +38,7 @@ spec: count: 1 serverType: VM.Standard1.1 # ubuntu minimal - wrong image - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm image: ocid1.image.oc1.eu-frankfurt-1.000000000000000000000000000000000000000000000000000000000001 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/succeeds-on-last-2/3.yaml b/manifests/testing-framework/test-sets/succeeds-on-last-2/3.yaml index 8c8e1ed49..2df741093 100644 --- a/manifests/testing-framework/test-sets/succeeds-on-last-2/3.yaml +++ b/manifests/testing-framework/test-sets/succeeds-on-last-2/3.yaml @@ -38,8 +38,8 @@ spec: count: 1 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 kubernetes: clusters: diff --git a/manifests/testing-framework/test-sets/test-set1/1.yaml b/manifests/testing-framework/test-sets/test-set1/1.yaml index 168cbb364..02224170e 100644 --- a/manifests/testing-framework/test-sets/test-set1/1.yaml +++ b/manifests/testing-framework/test-sets/test-set1/1.yaml @@ -97,7 +97,7 @@ spec: zone: europe-west2-c count: 3 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: test-set1 - name: gcp-cmpt-nodes @@ -107,7 +107,7 @@ spec: zone: europe-west1-b count: 3 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: test-set1 @@ -123,8 +123,8 @@ spec: count: 3 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla taints: - key: test effect: NoSchedule @@ -136,8 +136,8 @@ spec: count: 3 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-ctrl-nodes @@ -148,7 +148,7 @@ spec: count: 3 serverType: t3.small #ubuntu - image: ami-03df6dea56f8aa618 + image: ami-08eb150f611ca277f taints: - key: test value: test @@ -161,7 +161,7 @@ spec: count: 3 serverType: t3.small #ubuntu - image: ami-03c476a1ca8e3ebdc + image: ami-045a8ab02aadf4f88 storageDiskSize: 50 - name: azr-ctrl-nodes diff --git a/manifests/testing-framework/test-sets/test-set1/2.yaml b/manifests/testing-framework/test-sets/test-set1/2.yaml index 140fbec69..3e3965f59 100644 --- a/manifests/testing-framework/test-sets/test-set1/2.yaml +++ b/manifests/testing-framework/test-sets/test-set1/2.yaml @@ -75,7 +75,7 @@ spec: zone: europe-west2-c count: 2 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 labels: test-set: test-set1-new annotations: @@ -88,7 +88,7 @@ spec: zone: europe-west1-b count: 4 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 labels: test-set: test-set1-new @@ -104,8 +104,8 @@ spec: count: 2 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla - name: oci-cmpt-nodes providerSpec: name: oci-1 @@ -114,8 +114,8 @@ spec: count: 4 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-ctrl-nodes @@ -126,7 +126,7 @@ spec: count: 2 serverType: t3.small #ubuntu - image: ami-03df6dea56f8aa618 + image: ami-08eb150f611ca277f taints: - key: test value: test @@ -139,7 +139,7 @@ spec: count: 4 serverType: t3.small #ubuntu - image: ami-03c476a1ca8e3ebdc + image: ami-045a8ab02aadf4f88 storageDiskSize: 50 - name: azr-ctrl-nodes diff --git a/manifests/testing-framework/test-sets/test-set2/1.yaml b/manifests/testing-framework/test-sets/test-set2/1.yaml index ba07ae22e..76f453226 100644 --- a/manifests/testing-framework/test-sets/test-set2/1.yaml +++ b/manifests/testing-framework/test-sets/test-set2/1.yaml @@ -43,7 +43,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 - name: oci-kube-nodes @@ -54,8 +54,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 #-----------LB nodepools---------- @@ -66,7 +66,7 @@ spec: zone: europe-west1-c count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: htz-ldbl-nodes @@ -87,8 +87,8 @@ spec: count: 3 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-ldbl-nodes @@ -99,7 +99,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: azr-ldbl-nodes diff --git a/manifests/testing-framework/test-sets/test-set2/2.yaml b/manifests/testing-framework/test-sets/test-set2/2.yaml index 79021d3fe..25af06fc6 100644 --- a/manifests/testing-framework/test-sets/test-set2/2.yaml +++ b/manifests/testing-framework/test-sets/test-set2/2.yaml @@ -48,7 +48,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 - name: oci-kube-nodes @@ -59,8 +59,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 #-----------LB nodepools---------- @@ -71,7 +71,7 @@ spec: zone: europe-west1-c count: 3 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: htz-ldbl-nodes @@ -92,8 +92,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-ldbl-nodes @@ -104,7 +104,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: azr-ldbl-nodes diff --git a/manifests/testing-framework/test-sets/test-set2/3.yaml b/manifests/testing-framework/test-sets/test-set2/3.yaml index 819be8679..7519627cc 100644 --- a/manifests/testing-framework/test-sets/test-set2/3.yaml +++ b/manifests/testing-framework/test-sets/test-set2/3.yaml @@ -43,7 +43,7 @@ spec: zone: fsn1-dc14 count: 1 serverType: cpx11 - image: ubuntu-22.04 + image: ubuntu-24.04 storageDiskSize: 50 - name: oci-kube-nodes @@ -54,8 +54,8 @@ spec: count: 1 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 #-----------LB nodepools---------- @@ -66,7 +66,7 @@ spec: zone: europe-west1-c count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: htz-ldbl-nodes @@ -87,8 +87,8 @@ spec: count: 2 serverType: VM.Standard2.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-ldbl-nodes @@ -99,7 +99,7 @@ spec: count: 2 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: azr-ldbl-nodes diff --git a/manifests/testing-framework/test-sets/test-set3/1.yaml b/manifests/testing-framework/test-sets/test-set3/1.yaml index 79cbed9a0..be2b17127 100644 --- a/manifests/testing-framework/test-sets/test-set3/1.yaml +++ b/manifests/testing-framework/test-sets/test-set3/1.yaml @@ -49,8 +49,8 @@ spec: # use 8 gb of memory. memory: 8 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: aws-kube-nodes @@ -61,16 +61,16 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-01b8d743224353ffe + image: ami-0e8d228ad90af673b storageDiskSize: 50 - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 2 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 - name: gcp-ctrl-nodes @@ -80,7 +80,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 - name: gcp-cmpt-nodes providerSpec: @@ -89,7 +89,7 @@ spec: zone: europe-west1-b count: 2 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 #-----------LB nodepools---------- @@ -100,7 +100,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/test-set3/2.yaml b/manifests/testing-framework/test-sets/test-set3/2.yaml index a7324c566..c56e48bfa 100644 --- a/manifests/testing-framework/test-sets/test-set3/2.yaml +++ b/manifests/testing-framework/test-sets/test-set3/2.yaml @@ -19,10 +19,10 @@ spec: - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 - name: gcp-cmpt-nodes @@ -32,7 +32,7 @@ spec: zone: europe-west1-b count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/test-set3/3.yaml b/manifests/testing-framework/test-sets/test-set3/3.yaml index cbf130435..6bc0cc81d 100644 --- a/manifests/testing-framework/test-sets/test-set3/3.yaml +++ b/manifests/testing-framework/test-sets/test-set3/3.yaml @@ -30,10 +30,10 @@ spec: - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 #-----------LB nodepools---------- @@ -44,7 +44,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: clusters: diff --git a/manifests/testing-framework/test-sets/test-set3/4.yaml b/manifests/testing-framework/test-sets/test-set3/4.yaml index 2a4251cc5..6b4f12a13 100644 --- a/manifests/testing-framework/test-sets/test-set3/4.yaml +++ b/manifests/testing-framework/test-sets/test-set3/4.yaml @@ -24,10 +24,10 @@ spec: - name: gen-kube-nodes providerSpec: name: genesiscloud-1 - region: ARC-IS-HAF-1 + region: NORD-NO-KRS-1 count: 1 - serverType: vcpu-2_memory-4g_disk-80g - image: "Ubuntu 22.04" + serverType: vcpu-2_memory-4g + image: "Ubuntu 24.04" storageDiskSize: 50 #-----------LB nodepools---------- @@ -38,7 +38,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/test-set4/1.yaml b/manifests/testing-framework/test-sets/test-set4/1.yaml index e8b8c53c9..9ec1ae08a 100644 --- a/manifests/testing-framework/test-sets/test-set4/1.yaml +++ b/manifests/testing-framework/test-sets/test-set4/1.yaml @@ -19,8 +19,8 @@ spec: count: 1 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/test-set4/2.yaml b/manifests/testing-framework/test-sets/test-set4/2.yaml index 406a2af18..635d2dbf1 100644 --- a/manifests/testing-framework/test-sets/test-set4/2.yaml +++ b/manifests/testing-framework/test-sets/test-set4/2.yaml @@ -29,8 +29,8 @@ spec: count: 1 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: gcp-kube-nodes @@ -40,7 +40,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 #-----------LB nodepools---------- @@ -51,7 +51,7 @@ spec: zone: europe-west1-c count: 1 serverType: e2-small - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: clusters: diff --git a/manifests/testing-framework/test-sets/test-set4/3.yaml b/manifests/testing-framework/test-sets/test-set4/3.yaml index 829744785..c2ade3d9d 100644 --- a/manifests/testing-framework/test-sets/test-set4/3.yaml +++ b/manifests/testing-framework/test-sets/test-set4/3.yaml @@ -29,8 +29,8 @@ spec: count: 1 serverType: VM.Standard1.1 # ubuntu minimal - # https://docs.oracle.com/en-us/iaas/images/image/674d0b41-aee8-4c0b-bf99-9e100d90f241/ - image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaavvsjwcjstxt4sb25na65yx6i34bzdy5oess3pkgwyfa4hxmzpqeq + # https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2024-08-28-0.htm + image: ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa7hxwyz4qiasffo7n7s4ep5lywpzwgkc2am65frqrqinoyitmxxla storageDiskSize: 50 - name: gcp-kube-nodes @@ -40,7 +40,7 @@ spec: zone: europe-west2-c count: 1 serverType: e2-medium - image: ubuntu-os-cloud/ubuntu-2204-jammy-v20221206 + image: ubuntu-minimal-2404-noble-amd64-v20241116 storageDiskSize: 50 kubernetes: diff --git a/manifests/testing-framework/test-sets/test-set5/1.yaml b/manifests/testing-framework/test-sets/test-set5/1.yaml index a350b97d7..4764e23ed 100644 --- a/manifests/testing-framework/test-sets/test-set5/1.yaml +++ b/manifests/testing-framework/test-sets/test-set5/1.yaml @@ -25,7 +25,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: aws-ldbl-nodes @@ -36,7 +36,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 static: diff --git a/manifests/testing-framework/test-sets/test-set5/2.yaml b/manifests/testing-framework/test-sets/test-set5/2.yaml index a350b97d7..4764e23ed 100644 --- a/manifests/testing-framework/test-sets/test-set5/2.yaml +++ b/manifests/testing-framework/test-sets/test-set5/2.yaml @@ -25,7 +25,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: aws-ldbl-nodes @@ -36,7 +36,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 static: diff --git a/manifests/testing-framework/test-sets/test-set5/3.yaml b/manifests/testing-framework/test-sets/test-set5/3.yaml index a7017adde..2cdbbde7e 100644 --- a/manifests/testing-framework/test-sets/test-set5/3.yaml +++ b/manifests/testing-framework/test-sets/test-set5/3.yaml @@ -25,7 +25,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 - name: aws-ldbl-nodes @@ -36,7 +36,7 @@ spec: count: 1 serverType: t3.small #ubuntu - image: ami-0039da1f3917fa8e3 + image: ami-0084a47cc718c111a storageDiskSize: 50 static: diff --git a/proto/pb/ansibler.pb.go b/proto/pb/ansibler.pb.go index 5548394b6..db22f2fb8 100644 --- a/proto/pb/ansibler.pb.go +++ b/proto/pb/ansibler.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: ansibler.proto @@ -33,11 +33,9 @@ type InstallRequest struct { func (x *InstallRequest) Reset() { *x = InstallRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InstallRequest) String() string { @@ -48,7 +46,7 @@ func (*InstallRequest) ProtoMessage() {} func (x *InstallRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type InstallResponse struct { func (x *InstallResponse) Reset() { *x = InstallResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InstallResponse) String() string { @@ -110,7 +106,7 @@ func (*InstallResponse) ProtoMessage() {} func (x *InstallResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -155,11 +151,9 @@ type SetUpLBRequest struct { func (x *SetUpLBRequest) Reset() { *x = SetUpLBRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpLBRequest) String() string { @@ -170,7 +164,7 @@ func (*SetUpLBRequest) ProtoMessage() {} func (x *SetUpLBRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -246,11 +240,9 @@ type SetUpLBResponse struct { func (x *SetUpLBResponse) Reset() { *x = SetUpLBResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpLBResponse) String() string { @@ -261,7 +253,7 @@ func (*SetUpLBResponse) ProtoMessage() {} func (x *SetUpLBResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -312,11 +304,9 @@ type TeardownLBRequest struct { func (x *TeardownLBRequest) Reset() { *x = TeardownLBRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TeardownLBRequest) String() string { @@ -327,7 +317,7 @@ func (*TeardownLBRequest) ProtoMessage() {} func (x *TeardownLBRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -390,11 +380,9 @@ type TeardownLBResponse struct { func (x *TeardownLBResponse) Reset() { *x = TeardownLBResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TeardownLBResponse) String() string { @@ -405,7 +393,7 @@ func (*TeardownLBResponse) ProtoMessage() {} func (x *TeardownLBResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -461,11 +449,9 @@ type UpdateAPIEndpointRequest struct { func (x *UpdateAPIEndpointRequest) Reset() { *x = UpdateAPIEndpointRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateAPIEndpointRequest) String() string { @@ -476,7 +462,7 @@ func (*UpdateAPIEndpointRequest) ProtoMessage() {} func (x *UpdateAPIEndpointRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -529,11 +515,9 @@ type UpdateAPIEndpointResponse struct { func (x *UpdateAPIEndpointResponse) Reset() { *x = UpdateAPIEndpointResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateAPIEndpointResponse) String() string { @@ -544,7 +528,7 @@ func (*UpdateAPIEndpointResponse) ProtoMessage() {} func (x *UpdateAPIEndpointResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -578,11 +562,9 @@ type UpdateProxyEnvsOnNodesRequest struct { func (x *UpdateProxyEnvsOnNodesRequest) Reset() { *x = UpdateProxyEnvsOnNodesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateProxyEnvsOnNodesRequest) String() string { @@ -593,7 +575,7 @@ func (*UpdateProxyEnvsOnNodesRequest) ProtoMessage() {} func (x *UpdateProxyEnvsOnNodesRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -639,11 +621,9 @@ type UpdateProxyEnvsOnNodesResponse struct { func (x *UpdateProxyEnvsOnNodesResponse) Reset() { *x = UpdateProxyEnvsOnNodesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateProxyEnvsOnNodesResponse) String() string { @@ -654,7 +634,7 @@ func (*UpdateProxyEnvsOnNodesResponse) ProtoMessage() {} func (x *UpdateProxyEnvsOnNodesResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -689,11 +669,9 @@ type UpdateNoProxyEnvsInKubernetesRequest struct { func (x *UpdateNoProxyEnvsInKubernetesRequest) Reset() { *x = UpdateNoProxyEnvsInKubernetesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateNoProxyEnvsInKubernetesRequest) String() string { @@ -704,7 +682,7 @@ func (*UpdateNoProxyEnvsInKubernetesRequest) ProtoMessage() {} func (x *UpdateNoProxyEnvsInKubernetesRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -757,11 +735,9 @@ type UpdateNoProxyEnvsInKubernetesResponse struct { func (x *UpdateNoProxyEnvsInKubernetesResponse) Reset() { *x = UpdateNoProxyEnvsInKubernetesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateNoProxyEnvsInKubernetesResponse) String() string { @@ -772,7 +748,7 @@ func (*UpdateNoProxyEnvsInKubernetesResponse) ProtoMessage() {} func (x *UpdateNoProxyEnvsInKubernetesResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -806,11 +782,9 @@ type RemoveClaudieUtilitiesRequest struct { func (x *RemoveClaudieUtilitiesRequest) Reset() { *x = RemoveClaudieUtilitiesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoveClaudieUtilitiesRequest) String() string { @@ -821,7 +795,7 @@ func (*RemoveClaudieUtilitiesRequest) ProtoMessage() {} func (x *RemoveClaudieUtilitiesRequest) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -868,11 +842,9 @@ type RemoveClaudieUtilitiesResponse struct { func (x *RemoveClaudieUtilitiesResponse) Reset() { *x = RemoveClaudieUtilitiesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoveClaudieUtilitiesResponse) String() string { @@ -883,7 +855,7 @@ func (*RemoveClaudieUtilitiesResponse) ProtoMessage() {} func (x *RemoveClaudieUtilitiesResponse) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -923,11 +895,9 @@ type UpdateAPIEndpointRequest_Endpoint struct { func (x *UpdateAPIEndpointRequest_Endpoint) Reset() { *x = UpdateAPIEndpointRequest_Endpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_ansibler_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ansibler_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateAPIEndpointRequest_Endpoint) String() string { @@ -938,7 +908,7 @@ func (*UpdateAPIEndpointRequest_Endpoint) ProtoMessage() {} func (x *UpdateAPIEndpointRequest_Endpoint) ProtoReflect() protoreflect.Message { mi := &file_ansibler_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1185,7 +1155,7 @@ func file_ansibler_proto_rawDescGZIP() []byte { } var file_ansibler_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_ansibler_proto_goTypes = []interface{}{ +var file_ansibler_proto_goTypes = []any{ (*InstallRequest)(nil), // 0: claudie.InstallRequest (*InstallResponse)(nil), // 1: claudie.InstallResponse (*SetUpLBRequest)(nil), // 2: claudie.SetUpLBRequest @@ -1267,188 +1237,6 @@ func file_ansibler_proto_init() { if File_ansibler_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_ansibler_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InstallRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InstallResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpLBRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpLBResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TeardownLBRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TeardownLBResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateAPIEndpointRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateAPIEndpointResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateProxyEnvsOnNodesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateProxyEnvsOnNodesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateNoProxyEnvsInKubernetesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateNoProxyEnvsInKubernetesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveClaudieUtilitiesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveClaudieUtilitiesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_ansibler_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateAPIEndpointRequest_Endpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/ansibler_grpc.pb.go b/proto/pb/ansibler_grpc.pb.go index 72c25c937..557f42eaa 100644 --- a/proto/pb/ansibler_grpc.pb.go +++ b/proto/pb/ansibler_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: ansibler.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( AnsiblerService_InstallNodeRequirements_FullMethodName = "/claudie.AnsiblerService/InstallNodeRequirements" @@ -62,8 +62,9 @@ func NewAnsiblerServiceClient(cc grpc.ClientConnInterface) AnsiblerServiceClient } func (c *ansiblerServiceClient) InstallNodeRequirements(ctx context.Context, in *InstallRequest, opts ...grpc.CallOption) (*InstallResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(InstallResponse) - err := c.cc.Invoke(ctx, AnsiblerService_InstallNodeRequirements_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_InstallNodeRequirements_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -71,8 +72,9 @@ func (c *ansiblerServiceClient) InstallNodeRequirements(ctx context.Context, in } func (c *ansiblerServiceClient) InstallVPN(ctx context.Context, in *InstallRequest, opts ...grpc.CallOption) (*InstallResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(InstallResponse) - err := c.cc.Invoke(ctx, AnsiblerService_InstallVPN_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_InstallVPN_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -80,8 +82,9 @@ func (c *ansiblerServiceClient) InstallVPN(ctx context.Context, in *InstallReque } func (c *ansiblerServiceClient) SetUpLoadbalancers(ctx context.Context, in *SetUpLBRequest, opts ...grpc.CallOption) (*SetUpLBResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SetUpLBResponse) - err := c.cc.Invoke(ctx, AnsiblerService_SetUpLoadbalancers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_SetUpLoadbalancers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,8 +92,9 @@ func (c *ansiblerServiceClient) SetUpLoadbalancers(ctx context.Context, in *SetU } func (c *ansiblerServiceClient) TeardownLoadBalancers(ctx context.Context, in *TeardownLBRequest, opts ...grpc.CallOption) (*TeardownLBResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TeardownLBResponse) - err := c.cc.Invoke(ctx, AnsiblerService_TeardownLoadBalancers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_TeardownLoadBalancers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -98,8 +102,9 @@ func (c *ansiblerServiceClient) TeardownLoadBalancers(ctx context.Context, in *T } func (c *ansiblerServiceClient) UpdateAPIEndpoint(ctx context.Context, in *UpdateAPIEndpointRequest, opts ...grpc.CallOption) (*UpdateAPIEndpointResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UpdateAPIEndpointResponse) - err := c.cc.Invoke(ctx, AnsiblerService_UpdateAPIEndpoint_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_UpdateAPIEndpoint_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -107,8 +112,9 @@ func (c *ansiblerServiceClient) UpdateAPIEndpoint(ctx context.Context, in *Updat } func (c *ansiblerServiceClient) UpdateProxyEnvsOnNodes(ctx context.Context, in *UpdateProxyEnvsOnNodesRequest, opts ...grpc.CallOption) (*UpdateProxyEnvsOnNodesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UpdateProxyEnvsOnNodesResponse) - err := c.cc.Invoke(ctx, AnsiblerService_UpdateProxyEnvsOnNodes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_UpdateProxyEnvsOnNodes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -116,8 +122,9 @@ func (c *ansiblerServiceClient) UpdateProxyEnvsOnNodes(ctx context.Context, in * } func (c *ansiblerServiceClient) UpdateNoProxyEnvsInKubernetes(ctx context.Context, in *UpdateNoProxyEnvsInKubernetesRequest, opts ...grpc.CallOption) (*UpdateNoProxyEnvsInKubernetesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UpdateNoProxyEnvsInKubernetesResponse) - err := c.cc.Invoke(ctx, AnsiblerService_UpdateNoProxyEnvsInKubernetes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_UpdateNoProxyEnvsInKubernetes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -125,8 +132,9 @@ func (c *ansiblerServiceClient) UpdateNoProxyEnvsInKubernetes(ctx context.Contex } func (c *ansiblerServiceClient) RemoveClaudieUtilities(ctx context.Context, in *RemoveClaudieUtilitiesRequest, opts ...grpc.CallOption) (*RemoveClaudieUtilitiesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(RemoveClaudieUtilitiesResponse) - err := c.cc.Invoke(ctx, AnsiblerService_RemoveClaudieUtilities_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, AnsiblerService_RemoveClaudieUtilities_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -135,7 +143,7 @@ func (c *ansiblerServiceClient) RemoveClaudieUtilities(ctx context.Context, in * // AnsiblerServiceServer is the server API for AnsiblerService service. // All implementations must embed UnimplementedAnsiblerServiceServer -// for forward compatibility +// for forward compatibility. type AnsiblerServiceServer interface { // InstallNodeRequirements installs any requirements there are on all of the nodes. InstallNodeRequirements(context.Context, *InstallRequest) (*InstallResponse, error) @@ -158,9 +166,12 @@ type AnsiblerServiceServer interface { mustEmbedUnimplementedAnsiblerServiceServer() } -// UnimplementedAnsiblerServiceServer must be embedded to have forward compatible implementations. -type UnimplementedAnsiblerServiceServer struct { -} +// UnimplementedAnsiblerServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedAnsiblerServiceServer struct{} func (UnimplementedAnsiblerServiceServer) InstallNodeRequirements(context.Context, *InstallRequest) (*InstallResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method InstallNodeRequirements not implemented") @@ -187,6 +198,7 @@ func (UnimplementedAnsiblerServiceServer) RemoveClaudieUtilities(context.Context return nil, status.Errorf(codes.Unimplemented, "method RemoveClaudieUtilities not implemented") } func (UnimplementedAnsiblerServiceServer) mustEmbedUnimplementedAnsiblerServiceServer() {} +func (UnimplementedAnsiblerServiceServer) testEmbeddedByValue() {} // UnsafeAnsiblerServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to AnsiblerServiceServer will @@ -196,6 +208,13 @@ type UnsafeAnsiblerServiceServer interface { } func RegisterAnsiblerServiceServer(s grpc.ServiceRegistrar, srv AnsiblerServiceServer) { + // If the following call pancis, it indicates UnimplementedAnsiblerServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&AnsiblerService_ServiceDesc, srv) } diff --git a/proto/pb/claudie-operator.pb.go b/proto/pb/claudie-operator.pb.go index 2078e3714..3d2fc45a4 100644 --- a/proto/pb/claudie-operator.pb.go +++ b/proto/pb/claudie-operator.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: claudie-operator.proto @@ -31,11 +31,9 @@ type SendAutoscalerEventRequest struct { func (x *SendAutoscalerEventRequest) Reset() { *x = SendAutoscalerEventRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_claudie_operator_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_claudie_operator_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SendAutoscalerEventRequest) String() string { @@ -46,7 +44,7 @@ func (*SendAutoscalerEventRequest) ProtoMessage() {} func (x *SendAutoscalerEventRequest) ProtoReflect() protoreflect.Message { mi := &file_claudie_operator_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -83,11 +81,9 @@ type SendAutoscalerEventResponse struct { func (x *SendAutoscalerEventResponse) Reset() { *x = SendAutoscalerEventResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_claudie_operator_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_claudie_operator_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SendAutoscalerEventResponse) String() string { @@ -98,7 +94,7 @@ func (*SendAutoscalerEventResponse) ProtoMessage() {} func (x *SendAutoscalerEventResponse) ProtoReflect() protoreflect.Message { mi := &file_claudie_operator_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -152,7 +148,7 @@ func file_claudie_operator_proto_rawDescGZIP() []byte { } var file_claudie_operator_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_claudie_operator_proto_goTypes = []interface{}{ +var file_claudie_operator_proto_goTypes = []any{ (*SendAutoscalerEventRequest)(nil), // 0: claudie.SendAutoscalerEventRequest (*SendAutoscalerEventResponse)(nil), // 1: claudie.SendAutoscalerEventResponse } @@ -171,32 +167,6 @@ func file_claudie_operator_proto_init() { if File_claudie_operator_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_claudie_operator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SendAutoscalerEventRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_claudie_operator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SendAutoscalerEventResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/claudie-operator_grpc.pb.go b/proto/pb/claudie-operator_grpc.pb.go index 2cebbb2d5..e857398b8 100644 --- a/proto/pb/claudie-operator_grpc.pb.go +++ b/proto/pb/claudie-operator_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: claudie-operator.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( OperatorService_SendAutoscalerEvent_FullMethodName = "/claudie.OperatorService/SendAutoscalerEvent" @@ -39,8 +39,9 @@ func NewOperatorServiceClient(cc grpc.ClientConnInterface) OperatorServiceClient } func (c *operatorServiceClient) SendAutoscalerEvent(ctx context.Context, in *SendAutoscalerEventRequest, opts ...grpc.CallOption) (*SendAutoscalerEventResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SendAutoscalerEventResponse) - err := c.cc.Invoke(ctx, OperatorService_SendAutoscalerEvent_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, OperatorService_SendAutoscalerEvent_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -49,21 +50,25 @@ func (c *operatorServiceClient) SendAutoscalerEvent(ctx context.Context, in *Sen // OperatorServiceServer is the server API for OperatorService service. // All implementations must embed UnimplementedOperatorServiceServer -// for forward compatibility +// for forward compatibility. type OperatorServiceServer interface { // SendAutoscalerEvent sends events to claudie-operator when a scale up/down occurs SendAutoscalerEvent(context.Context, *SendAutoscalerEventRequest) (*SendAutoscalerEventResponse, error) mustEmbedUnimplementedOperatorServiceServer() } -// UnimplementedOperatorServiceServer must be embedded to have forward compatible implementations. -type UnimplementedOperatorServiceServer struct { -} +// UnimplementedOperatorServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedOperatorServiceServer struct{} func (UnimplementedOperatorServiceServer) SendAutoscalerEvent(context.Context, *SendAutoscalerEventRequest) (*SendAutoscalerEventResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SendAutoscalerEvent not implemented") } func (UnimplementedOperatorServiceServer) mustEmbedUnimplementedOperatorServiceServer() {} +func (UnimplementedOperatorServiceServer) testEmbeddedByValue() {} // UnsafeOperatorServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to OperatorServiceServer will @@ -73,6 +78,13 @@ type UnsafeOperatorServiceServer interface { } func RegisterOperatorServiceServer(s grpc.ServiceRegistrar, srv OperatorServiceServer) { + // If the following call pancis, it indicates UnimplementedOperatorServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&OperatorService_ServiceDesc, srv) } diff --git a/proto/pb/kubeEleven.pb.go b/proto/pb/kubeEleven.pb.go index 24a7a9bb7..989f536bf 100644 --- a/proto/pb/kubeEleven.pb.go +++ b/proto/pb/kubeEleven.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: kubeEleven.proto @@ -34,11 +34,9 @@ type BuildClusterRequest struct { func (x *BuildClusterRequest) Reset() { *x = BuildClusterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kubeEleven_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kubeEleven_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildClusterRequest) String() string { @@ -49,7 +47,7 @@ func (*BuildClusterRequest) ProtoMessage() {} func (x *BuildClusterRequest) ProtoReflect() protoreflect.Message { mi := &file_kubeEleven_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -103,11 +101,9 @@ type BuildClusterResponse struct { func (x *BuildClusterResponse) Reset() { *x = BuildClusterResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kubeEleven_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kubeEleven_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildClusterResponse) String() string { @@ -118,7 +114,7 @@ func (*BuildClusterResponse) ProtoMessage() {} func (x *BuildClusterResponse) ProtoReflect() protoreflect.Message { mi := &file_kubeEleven_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -159,11 +155,9 @@ type DestroyClusterRequest struct { func (x *DestroyClusterRequest) Reset() { *x = DestroyClusterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kubeEleven_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kubeEleven_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyClusterRequest) String() string { @@ -174,7 +168,7 @@ func (*DestroyClusterRequest) ProtoMessage() {} func (x *DestroyClusterRequest) ProtoReflect() protoreflect.Message { mi := &file_kubeEleven_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -221,11 +215,9 @@ type DestroyClusterResponse struct { func (x *DestroyClusterResponse) Reset() { *x = DestroyClusterResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kubeEleven_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kubeEleven_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyClusterResponse) String() string { @@ -236,7 +228,7 @@ func (*DestroyClusterResponse) ProtoMessage() {} func (x *DestroyClusterResponse) ProtoReflect() protoreflect.Message { mi := &file_kubeEleven_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -336,7 +328,7 @@ func file_kubeEleven_proto_rawDescGZIP() []byte { } var file_kubeEleven_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_kubeEleven_proto_goTypes = []interface{}{ +var file_kubeEleven_proto_goTypes = []any{ (*BuildClusterRequest)(nil), // 0: claudie.BuildClusterRequest (*BuildClusterResponse)(nil), // 1: claudie.BuildClusterResponse (*DestroyClusterRequest)(nil), // 2: claudie.DestroyClusterRequest @@ -371,56 +363,6 @@ func file_kubeEleven_proto_init() { if File_kubeEleven_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_kubeEleven_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildClusterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kubeEleven_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildClusterResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kubeEleven_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyClusterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kubeEleven_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyClusterResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/kubeEleven_grpc.pb.go b/proto/pb/kubeEleven_grpc.pb.go index 9cd8f35da..5cea3022f 100644 --- a/proto/pb/kubeEleven_grpc.pb.go +++ b/proto/pb/kubeEleven_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: kubeEleven.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( KubeElevenService_BuildCluster_FullMethodName = "/claudie.KubeElevenService/BuildCluster" @@ -42,8 +42,9 @@ func NewKubeElevenServiceClient(cc grpc.ClientConnInterface) KubeElevenServiceCl } func (c *kubeElevenServiceClient) BuildCluster(ctx context.Context, in *BuildClusterRequest, opts ...grpc.CallOption) (*BuildClusterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BuildClusterResponse) - err := c.cc.Invoke(ctx, KubeElevenService_BuildCluster_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KubeElevenService_BuildCluster_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -51,8 +52,9 @@ func (c *kubeElevenServiceClient) BuildCluster(ctx context.Context, in *BuildClu } func (c *kubeElevenServiceClient) DestroyCluster(ctx context.Context, in *DestroyClusterRequest, opts ...grpc.CallOption) (*DestroyClusterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DestroyClusterResponse) - err := c.cc.Invoke(ctx, KubeElevenService_DestroyCluster_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KubeElevenService_DestroyCluster_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -61,7 +63,7 @@ func (c *kubeElevenServiceClient) DestroyCluster(ctx context.Context, in *Destro // KubeElevenServiceServer is the server API for KubeElevenService service. // All implementations must embed UnimplementedKubeElevenServiceServer -// for forward compatibility +// for forward compatibility. type KubeElevenServiceServer interface { // BuildCluster builds the kubernetes clusters specified in the provided config. BuildCluster(context.Context, *BuildClusterRequest) (*BuildClusterResponse, error) @@ -70,9 +72,12 @@ type KubeElevenServiceServer interface { mustEmbedUnimplementedKubeElevenServiceServer() } -// UnimplementedKubeElevenServiceServer must be embedded to have forward compatible implementations. -type UnimplementedKubeElevenServiceServer struct { -} +// UnimplementedKubeElevenServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedKubeElevenServiceServer struct{} func (UnimplementedKubeElevenServiceServer) BuildCluster(context.Context, *BuildClusterRequest) (*BuildClusterResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method BuildCluster not implemented") @@ -81,6 +86,7 @@ func (UnimplementedKubeElevenServiceServer) DestroyCluster(context.Context, *Des return nil, status.Errorf(codes.Unimplemented, "method DestroyCluster not implemented") } func (UnimplementedKubeElevenServiceServer) mustEmbedUnimplementedKubeElevenServiceServer() {} +func (UnimplementedKubeElevenServiceServer) testEmbeddedByValue() {} // UnsafeKubeElevenServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to KubeElevenServiceServer will @@ -90,6 +96,13 @@ type UnsafeKubeElevenServiceServer interface { } func RegisterKubeElevenServiceServer(s grpc.ServiceRegistrar, srv KubeElevenServiceServer) { + // If the following call pancis, it indicates UnimplementedKubeElevenServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&KubeElevenService_ServiceDesc, srv) } diff --git a/proto/pb/kuber.pb.go b/proto/pb/kuber.pb.go index 2b39e5068..4b1b80e58 100644 --- a/proto/pb/kuber.pb.go +++ b/proto/pb/kuber.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: kuber.proto @@ -31,11 +31,9 @@ type SetUpStorageRequest struct { func (x *SetUpStorageRequest) Reset() { *x = SetUpStorageRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpStorageRequest) String() string { @@ -46,7 +44,7 @@ func (*SetUpStorageRequest) ProtoMessage() {} func (x *SetUpStorageRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -78,11 +76,9 @@ type SetUpStorageResponse struct { func (x *SetUpStorageResponse) Reset() { *x = SetUpStorageResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpStorageResponse) String() string { @@ -93,7 +89,7 @@ func (*SetUpStorageResponse) ProtoMessage() {} func (x *SetUpStorageResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -126,11 +122,9 @@ type StoreKubeconfigRequest struct { func (x *StoreKubeconfigRequest) Reset() { *x = StoreKubeconfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreKubeconfigRequest) String() string { @@ -141,7 +135,7 @@ func (*StoreKubeconfigRequest) ProtoMessage() {} func (x *StoreKubeconfigRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -178,11 +172,9 @@ type StoreKubeconfigResponse struct { func (x *StoreKubeconfigResponse) Reset() { *x = StoreKubeconfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreKubeconfigResponse) String() string { @@ -193,7 +185,7 @@ func (*StoreKubeconfigResponse) ProtoMessage() {} func (x *StoreKubeconfigResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -218,11 +210,9 @@ type DeleteKubeconfigRequest struct { func (x *DeleteKubeconfigRequest) Reset() { *x = DeleteKubeconfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteKubeconfigRequest) String() string { @@ -233,7 +223,7 @@ func (*DeleteKubeconfigRequest) ProtoMessage() {} func (x *DeleteKubeconfigRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -263,11 +253,9 @@ type DeleteKubeconfigResponse struct { func (x *DeleteKubeconfigResponse) Reset() { *x = DeleteKubeconfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteKubeconfigResponse) String() string { @@ -278,7 +266,7 @@ func (*DeleteKubeconfigResponse) ProtoMessage() {} func (x *DeleteKubeconfigResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -305,11 +293,9 @@ type DeleteNodesRequest struct { func (x *DeleteNodesRequest) Reset() { *x = DeleteNodesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteNodesRequest) String() string { @@ -320,7 +306,7 @@ func (*DeleteNodesRequest) ProtoMessage() {} func (x *DeleteNodesRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -366,11 +352,9 @@ type DeleteNodesResponse struct { func (x *DeleteNodesResponse) Reset() { *x = DeleteNodesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteNodesResponse) String() string { @@ -381,7 +365,7 @@ func (*DeleteNodesResponse) ProtoMessage() {} func (x *DeleteNodesResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -415,11 +399,9 @@ type StoreClusterMetadataRequest struct { func (x *StoreClusterMetadataRequest) Reset() { *x = StoreClusterMetadataRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreClusterMetadataRequest) String() string { @@ -430,7 +412,7 @@ func (*StoreClusterMetadataRequest) ProtoMessage() {} func (x *StoreClusterMetadataRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -474,11 +456,9 @@ type StoreClusterMetadataResponse struct { func (x *StoreClusterMetadataResponse) Reset() { *x = StoreClusterMetadataResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreClusterMetadataResponse) String() string { @@ -489,7 +469,7 @@ func (*StoreClusterMetadataResponse) ProtoMessage() {} func (x *StoreClusterMetadataResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -515,11 +495,9 @@ type StoreLBScrapeConfigRequest struct { func (x *StoreLBScrapeConfigRequest) Reset() { *x = StoreLBScrapeConfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreLBScrapeConfigRequest) String() string { @@ -530,7 +508,7 @@ func (*StoreLBScrapeConfigRequest) ProtoMessage() {} func (x *StoreLBScrapeConfigRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -567,11 +545,9 @@ type StoreLBScrapeConfigResponse struct { func (x *StoreLBScrapeConfigResponse) Reset() { *x = StoreLBScrapeConfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StoreLBScrapeConfigResponse) String() string { @@ -582,7 +558,7 @@ func (*StoreLBScrapeConfigResponse) ProtoMessage() {} func (x *StoreLBScrapeConfigResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -607,11 +583,9 @@ type RemoveLBScrapeConfigRequest struct { func (x *RemoveLBScrapeConfigRequest) Reset() { *x = RemoveLBScrapeConfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoveLBScrapeConfigRequest) String() string { @@ -622,7 +596,7 @@ func (*RemoveLBScrapeConfigRequest) ProtoMessage() {} func (x *RemoveLBScrapeConfigRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -652,11 +626,9 @@ type RemoveLBScrapeConfigResponse struct { func (x *RemoveLBScrapeConfigResponse) Reset() { *x = RemoveLBScrapeConfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoveLBScrapeConfigResponse) String() string { @@ -667,7 +639,7 @@ func (*RemoveLBScrapeConfigResponse) ProtoMessage() {} func (x *RemoveLBScrapeConfigResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -692,11 +664,9 @@ type DeleteClusterMetadataRequest struct { func (x *DeleteClusterMetadataRequest) Reset() { *x = DeleteClusterMetadataRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteClusterMetadataRequest) String() string { @@ -707,7 +677,7 @@ func (*DeleteClusterMetadataRequest) ProtoMessage() {} func (x *DeleteClusterMetadataRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -737,11 +707,9 @@ type DeleteClusterMetadataResponse struct { func (x *DeleteClusterMetadataResponse) Reset() { *x = DeleteClusterMetadataResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteClusterMetadataResponse) String() string { @@ -752,7 +720,7 @@ func (*DeleteClusterMetadataResponse) ProtoMessage() {} func (x *DeleteClusterMetadataResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -777,11 +745,9 @@ type PatchNodesRequest struct { func (x *PatchNodesRequest) Reset() { *x = PatchNodesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchNodesRequest) String() string { @@ -792,7 +758,7 @@ func (*PatchNodesRequest) ProtoMessage() {} func (x *PatchNodesRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -822,11 +788,9 @@ type PatchNodesResponse struct { func (x *PatchNodesResponse) Reset() { *x = PatchNodesResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchNodesResponse) String() string { @@ -837,7 +801,7 @@ func (*PatchNodesResponse) ProtoMessage() {} func (x *PatchNodesResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -863,11 +827,9 @@ type SetUpClusterAutoscalerRequest struct { func (x *SetUpClusterAutoscalerRequest) Reset() { *x = SetUpClusterAutoscalerRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpClusterAutoscalerRequest) String() string { @@ -878,7 +840,7 @@ func (*SetUpClusterAutoscalerRequest) ProtoMessage() {} func (x *SetUpClusterAutoscalerRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -915,11 +877,9 @@ type SetUpClusterAutoscalerResponse struct { func (x *SetUpClusterAutoscalerResponse) Reset() { *x = SetUpClusterAutoscalerResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetUpClusterAutoscalerResponse) String() string { @@ -930,7 +890,7 @@ func (*SetUpClusterAutoscalerResponse) ProtoMessage() {} func (x *SetUpClusterAutoscalerResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -956,11 +916,9 @@ type DestroyClusterAutoscalerRequest struct { func (x *DestroyClusterAutoscalerRequest) Reset() { *x = DestroyClusterAutoscalerRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyClusterAutoscalerRequest) String() string { @@ -971,7 +929,7 @@ func (*DestroyClusterAutoscalerRequest) ProtoMessage() {} func (x *DestroyClusterAutoscalerRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1008,11 +966,9 @@ type DestroyClusterAutoscalerResponse struct { func (x *DestroyClusterAutoscalerResponse) Reset() { *x = DestroyClusterAutoscalerResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyClusterAutoscalerResponse) String() string { @@ -1023,7 +979,7 @@ func (*DestroyClusterAutoscalerResponse) ProtoMessage() {} func (x *DestroyClusterAutoscalerResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1048,11 +1004,9 @@ type PatchClusterInfoConfigMapRequest struct { func (x *PatchClusterInfoConfigMapRequest) Reset() { *x = PatchClusterInfoConfigMapRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchClusterInfoConfigMapRequest) String() string { @@ -1063,7 +1017,7 @@ func (*PatchClusterInfoConfigMapRequest) ProtoMessage() {} func (x *PatchClusterInfoConfigMapRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1093,11 +1047,9 @@ type PatchClusterInfoConfigMapResponse struct { func (x *PatchClusterInfoConfigMapResponse) Reset() { *x = PatchClusterInfoConfigMapResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchClusterInfoConfigMapResponse) String() string { @@ -1108,7 +1060,7 @@ func (*PatchClusterInfoConfigMapResponse) ProtoMessage() {} func (x *PatchClusterInfoConfigMapResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1133,11 +1085,9 @@ type CiliumRolloutRestartRequest struct { func (x *CiliumRolloutRestartRequest) Reset() { *x = CiliumRolloutRestartRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CiliumRolloutRestartRequest) String() string { @@ -1148,7 +1098,7 @@ func (*CiliumRolloutRestartRequest) ProtoMessage() {} func (x *CiliumRolloutRestartRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1178,11 +1128,9 @@ type CiliumRolloutRestartResponse struct { func (x *CiliumRolloutRestartResponse) Reset() { *x = CiliumRolloutRestartResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CiliumRolloutRestartResponse) String() string { @@ -1193,7 +1141,7 @@ func (*CiliumRolloutRestartResponse) ProtoMessage() {} func (x *CiliumRolloutRestartResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1218,11 +1166,9 @@ type PatchKubeProxyConfigMapRequest struct { func (x *PatchKubeProxyConfigMapRequest) Reset() { *x = PatchKubeProxyConfigMapRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchKubeProxyConfigMapRequest) String() string { @@ -1233,7 +1179,7 @@ func (*PatchKubeProxyConfigMapRequest) ProtoMessage() {} func (x *PatchKubeProxyConfigMapRequest) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1263,11 +1209,9 @@ type PatchKubeProxyConfigMapResponse struct { func (x *PatchKubeProxyConfigMapResponse) Reset() { *x = PatchKubeProxyConfigMapResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_kuber_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_kuber_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PatchKubeProxyConfigMapResponse) String() string { @@ -1278,7 +1222,7 @@ func (*PatchKubeProxyConfigMapResponse) ProtoMessage() {} func (x *PatchKubeProxyConfigMapResponse) ProtoReflect() protoreflect.Message { mi := &file_kuber_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1521,7 +1465,7 @@ func file_kuber_proto_rawDescGZIP() []byte { } var file_kuber_proto_msgTypes = make([]protoimpl.MessageInfo, 28) -var file_kuber_proto_goTypes = []interface{}{ +var file_kuber_proto_goTypes = []any{ (*SetUpStorageRequest)(nil), // 0: claudie.SetUpStorageRequest (*SetUpStorageResponse)(nil), // 1: claudie.SetUpStorageResponse (*StoreKubeconfigRequest)(nil), // 2: claudie.StoreKubeconfigRequest @@ -1612,344 +1556,6 @@ func file_kuber_proto_init() { if File_kuber_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_kuber_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpStorageRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpStorageResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreKubeconfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreKubeconfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteKubeconfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteKubeconfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteNodesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteNodesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreClusterMetadataRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreClusterMetadataResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreLBScrapeConfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StoreLBScrapeConfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveLBScrapeConfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveLBScrapeConfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteClusterMetadataRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteClusterMetadataResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchNodesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchNodesResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpClusterAutoscalerRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetUpClusterAutoscalerResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyClusterAutoscalerRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyClusterAutoscalerResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchClusterInfoConfigMapRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchClusterInfoConfigMapResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CiliumRolloutRestartRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CiliumRolloutRestartResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchKubeProxyConfigMapRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_kuber_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PatchKubeProxyConfigMapResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/kuber_grpc.pb.go b/proto/pb/kuber_grpc.pb.go index 47cc6e3e2..61eb0c74d 100644 --- a/proto/pb/kuber_grpc.pb.go +++ b/proto/pb/kuber_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: kuber.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( KuberService_RemoveLBScrapeConfig_FullMethodName = "/claudie.KuberService/RemoveLBScrapeConfig" @@ -93,8 +93,9 @@ func NewKuberServiceClient(cc grpc.ClientConnInterface) KuberServiceClient { } func (c *kuberServiceClient) RemoveLBScrapeConfig(ctx context.Context, in *RemoveLBScrapeConfigRequest, opts ...grpc.CallOption) (*RemoveLBScrapeConfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(RemoveLBScrapeConfigResponse) - err := c.cc.Invoke(ctx, KuberService_RemoveLBScrapeConfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_RemoveLBScrapeConfig_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -102,8 +103,9 @@ func (c *kuberServiceClient) RemoveLBScrapeConfig(ctx context.Context, in *Remov } func (c *kuberServiceClient) StoreLBScrapeConfig(ctx context.Context, in *StoreLBScrapeConfigRequest, opts ...grpc.CallOption) (*StoreLBScrapeConfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StoreLBScrapeConfigResponse) - err := c.cc.Invoke(ctx, KuberService_StoreLBScrapeConfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_StoreLBScrapeConfig_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -111,8 +113,9 @@ func (c *kuberServiceClient) StoreLBScrapeConfig(ctx context.Context, in *StoreL } func (c *kuberServiceClient) StoreClusterMetadata(ctx context.Context, in *StoreClusterMetadataRequest, opts ...grpc.CallOption) (*StoreClusterMetadataResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StoreClusterMetadataResponse) - err := c.cc.Invoke(ctx, KuberService_StoreClusterMetadata_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_StoreClusterMetadata_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -120,8 +123,9 @@ func (c *kuberServiceClient) StoreClusterMetadata(ctx context.Context, in *Store } func (c *kuberServiceClient) DeleteClusterMetadata(ctx context.Context, in *DeleteClusterMetadataRequest, opts ...grpc.CallOption) (*DeleteClusterMetadataResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DeleteClusterMetadataResponse) - err := c.cc.Invoke(ctx, KuberService_DeleteClusterMetadata_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_DeleteClusterMetadata_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -129,8 +133,9 @@ func (c *kuberServiceClient) DeleteClusterMetadata(ctx context.Context, in *Dele } func (c *kuberServiceClient) SetUpStorage(ctx context.Context, in *SetUpStorageRequest, opts ...grpc.CallOption) (*SetUpStorageResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SetUpStorageResponse) - err := c.cc.Invoke(ctx, KuberService_SetUpStorage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_SetUpStorage_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -138,8 +143,9 @@ func (c *kuberServiceClient) SetUpStorage(ctx context.Context, in *SetUpStorageR } func (c *kuberServiceClient) StoreKubeconfig(ctx context.Context, in *StoreKubeconfigRequest, opts ...grpc.CallOption) (*StoreKubeconfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StoreKubeconfigResponse) - err := c.cc.Invoke(ctx, KuberService_StoreKubeconfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_StoreKubeconfig_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -147,8 +153,9 @@ func (c *kuberServiceClient) StoreKubeconfig(ctx context.Context, in *StoreKubec } func (c *kuberServiceClient) DeleteKubeconfig(ctx context.Context, in *DeleteKubeconfigRequest, opts ...grpc.CallOption) (*DeleteKubeconfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DeleteKubeconfigResponse) - err := c.cc.Invoke(ctx, KuberService_DeleteKubeconfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_DeleteKubeconfig_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -156,8 +163,9 @@ func (c *kuberServiceClient) DeleteKubeconfig(ctx context.Context, in *DeleteKub } func (c *kuberServiceClient) DeleteNodes(ctx context.Context, in *DeleteNodesRequest, opts ...grpc.CallOption) (*DeleteNodesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DeleteNodesResponse) - err := c.cc.Invoke(ctx, KuberService_DeleteNodes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_DeleteNodes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -165,8 +173,9 @@ func (c *kuberServiceClient) DeleteNodes(ctx context.Context, in *DeleteNodesReq } func (c *kuberServiceClient) PatchNodes(ctx context.Context, in *PatchNodesRequest, opts ...grpc.CallOption) (*PatchNodesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PatchNodesResponse) - err := c.cc.Invoke(ctx, KuberService_PatchNodes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_PatchNodes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -174,8 +183,9 @@ func (c *kuberServiceClient) PatchNodes(ctx context.Context, in *PatchNodesReque } func (c *kuberServiceClient) SetUpClusterAutoscaler(ctx context.Context, in *SetUpClusterAutoscalerRequest, opts ...grpc.CallOption) (*SetUpClusterAutoscalerResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SetUpClusterAutoscalerResponse) - err := c.cc.Invoke(ctx, KuberService_SetUpClusterAutoscaler_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_SetUpClusterAutoscaler_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -183,8 +193,9 @@ func (c *kuberServiceClient) SetUpClusterAutoscaler(ctx context.Context, in *Set } func (c *kuberServiceClient) DestroyClusterAutoscaler(ctx context.Context, in *DestroyClusterAutoscalerRequest, opts ...grpc.CallOption) (*DestroyClusterAutoscalerResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DestroyClusterAutoscalerResponse) - err := c.cc.Invoke(ctx, KuberService_DestroyClusterAutoscaler_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_DestroyClusterAutoscaler_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -192,8 +203,9 @@ func (c *kuberServiceClient) DestroyClusterAutoscaler(ctx context.Context, in *D } func (c *kuberServiceClient) PatchClusterInfoConfigMap(ctx context.Context, in *PatchClusterInfoConfigMapRequest, opts ...grpc.CallOption) (*PatchClusterInfoConfigMapResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PatchClusterInfoConfigMapResponse) - err := c.cc.Invoke(ctx, KuberService_PatchClusterInfoConfigMap_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_PatchClusterInfoConfigMap_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -201,8 +213,9 @@ func (c *kuberServiceClient) PatchClusterInfoConfigMap(ctx context.Context, in * } func (c *kuberServiceClient) PatchKubeProxyConfigMap(ctx context.Context, in *PatchKubeProxyConfigMapRequest, opts ...grpc.CallOption) (*PatchKubeProxyConfigMapResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PatchKubeProxyConfigMapResponse) - err := c.cc.Invoke(ctx, KuberService_PatchKubeProxyConfigMap_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_PatchKubeProxyConfigMap_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -210,8 +223,9 @@ func (c *kuberServiceClient) PatchKubeProxyConfigMap(ctx context.Context, in *Pa } func (c *kuberServiceClient) CiliumRolloutRestart(ctx context.Context, in *CiliumRolloutRestartRequest, opts ...grpc.CallOption) (*CiliumRolloutRestartResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CiliumRolloutRestartResponse) - err := c.cc.Invoke(ctx, KuberService_CiliumRolloutRestart_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KuberService_CiliumRolloutRestart_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -220,7 +234,7 @@ func (c *kuberServiceClient) CiliumRolloutRestart(ctx context.Context, in *Ciliu // KuberServiceServer is the server API for KuberService service. // All implementations must embed UnimplementedKuberServiceServer -// for forward compatibility +// for forward compatibility. type KuberServiceServer interface { // RemoveLBScrapeConfig removes scrape config for every LB detached from this // cluster. @@ -268,9 +282,12 @@ type KuberServiceServer interface { mustEmbedUnimplementedKuberServiceServer() } -// UnimplementedKuberServiceServer must be embedded to have forward compatible implementations. -type UnimplementedKuberServiceServer struct { -} +// UnimplementedKuberServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedKuberServiceServer struct{} func (UnimplementedKuberServiceServer) RemoveLBScrapeConfig(context.Context, *RemoveLBScrapeConfigRequest) (*RemoveLBScrapeConfigResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveLBScrapeConfig not implemented") @@ -315,6 +332,7 @@ func (UnimplementedKuberServiceServer) CiliumRolloutRestart(context.Context, *Ci return nil, status.Errorf(codes.Unimplemented, "method CiliumRolloutRestart not implemented") } func (UnimplementedKuberServiceServer) mustEmbedUnimplementedKuberServiceServer() {} +func (UnimplementedKuberServiceServer) testEmbeddedByValue() {} // UnsafeKuberServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to KuberServiceServer will @@ -324,6 +342,13 @@ type UnsafeKuberServiceServer interface { } func RegisterKuberServiceServer(s grpc.ServiceRegistrar, srv KuberServiceServer) { + // If the following call pancis, it indicates UnimplementedKuberServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&KuberService_ServiceDesc, srv) } diff --git a/proto/pb/manager.pb.go b/proto/pb/manager.pb.go index 733c06691..5042ff147 100644 --- a/proto/pb/manager.pb.go +++ b/proto/pb/manager.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: manager.proto @@ -33,11 +33,9 @@ type UpsertManifestRequest struct { func (x *UpsertManifestRequest) Reset() { *x = UpsertManifestRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpsertManifestRequest) String() string { @@ -48,7 +46,7 @@ func (*UpsertManifestRequest) ProtoMessage() {} func (x *UpsertManifestRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type UpsertManifestResponse struct { func (x *UpsertManifestResponse) Reset() { *x = UpsertManifestResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpsertManifestResponse) String() string { @@ -110,7 +106,7 @@ func (*UpsertManifestResponse) ProtoMessage() {} func (x *UpsertManifestResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -150,11 +146,9 @@ type MarkForDeletionRequest struct { func (x *MarkForDeletionRequest) Reset() { *x = MarkForDeletionRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MarkForDeletionRequest) String() string { @@ -165,7 +159,7 @@ func (*MarkForDeletionRequest) ProtoMessage() {} func (x *MarkForDeletionRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -205,11 +199,9 @@ type MarkForDeletionResponse struct { func (x *MarkForDeletionResponse) Reset() { *x = MarkForDeletionResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MarkForDeletionResponse) String() string { @@ -220,7 +212,7 @@ func (*MarkForDeletionResponse) ProtoMessage() {} func (x *MarkForDeletionResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -257,11 +249,9 @@ type NextTaskRequest struct { func (x *NextTaskRequest) Reset() { *x = NextTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NextTaskRequest) String() string { @@ -272,7 +262,7 @@ func (*NextTaskRequest) ProtoMessage() {} func (x *NextTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -303,11 +293,9 @@ type NextTaskResponse struct { func (x *NextTaskResponse) Reset() { *x = NextTaskResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NextTaskResponse) String() string { @@ -318,7 +306,7 @@ func (*NextTaskResponse) ProtoMessage() {} func (x *NextTaskResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -396,11 +384,9 @@ type TaskUpdateRequest struct { func (x *TaskUpdateRequest) Reset() { *x = TaskUpdateRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TaskUpdateRequest) String() string { @@ -411,7 +397,7 @@ func (*TaskUpdateRequest) ProtoMessage() {} func (x *TaskUpdateRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -472,11 +458,9 @@ type TaskUpdateResponse struct { func (x *TaskUpdateResponse) Reset() { *x = TaskUpdateResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TaskUpdateResponse) String() string { @@ -487,7 +471,7 @@ func (*TaskUpdateResponse) ProtoMessage() {} func (x *TaskUpdateResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -524,11 +508,9 @@ type ListConfigRequest struct { func (x *ListConfigRequest) Reset() { *x = ListConfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListConfigRequest) String() string { @@ -539,7 +521,7 @@ func (*ListConfigRequest) ProtoMessage() {} func (x *ListConfigRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -564,11 +546,9 @@ type ListConfigResponse struct { func (x *ListConfigResponse) Reset() { *x = ListConfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListConfigResponse) String() string { @@ -579,7 +559,7 @@ func (*ListConfigResponse) ProtoMessage() {} func (x *ListConfigResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -611,11 +591,9 @@ type GetConfigRequest struct { func (x *GetConfigRequest) Reset() { *x = GetConfigRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetConfigRequest) String() string { @@ -626,7 +604,7 @@ func (*GetConfigRequest) ProtoMessage() {} func (x *GetConfigRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -658,11 +636,9 @@ type GetConfigResponse struct { func (x *GetConfigResponse) Reset() { *x = GetConfigResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetConfigResponse) String() string { @@ -673,7 +649,7 @@ func (*GetConfigResponse) ProtoMessage() {} func (x *GetConfigResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -708,11 +684,9 @@ type UpdateNodePoolRequest struct { func (x *UpdateNodePoolRequest) Reset() { *x = UpdateNodePoolRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateNodePoolRequest) String() string { @@ -723,7 +697,7 @@ func (*UpdateNodePoolRequest) ProtoMessage() {} func (x *UpdateNodePoolRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -777,11 +751,9 @@ type UpdateNodePoolResponse struct { func (x *UpdateNodePoolResponse) Reset() { *x = UpdateNodePoolResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateNodePoolResponse) String() string { @@ -792,7 +764,7 @@ func (*UpdateNodePoolResponse) ProtoMessage() {} func (x *UpdateNodePoolResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -836,11 +808,9 @@ type TaskCompleteRequest struct { func (x *TaskCompleteRequest) Reset() { *x = TaskCompleteRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TaskCompleteRequest) String() string { @@ -851,7 +821,7 @@ func (*TaskCompleteRequest) ProtoMessage() {} func (x *TaskCompleteRequest) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -919,11 +889,9 @@ type TaskCompleteResponse struct { func (x *TaskCompleteResponse) Reset() { *x = TaskCompleteResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_manager_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_manager_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TaskCompleteResponse) String() string { @@ -934,7 +902,7 @@ func (*TaskCompleteResponse) ProtoMessage() {} func (x *TaskCompleteResponse) ProtoReflect() protoreflect.Message { mi := &file_manager_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1119,7 +1087,7 @@ func file_manager_proto_rawDescGZIP() []byte { } var file_manager_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_manager_proto_goTypes = []interface{}{ +var file_manager_proto_goTypes = []any{ (*UpsertManifestRequest)(nil), // 0: claudie.UpsertManifestRequest (*UpsertManifestResponse)(nil), // 1: claudie.UpsertManifestResponse (*MarkForDeletionRequest)(nil), // 2: claudie.MarkForDeletionRequest @@ -1184,200 +1152,6 @@ func file_manager_proto_init() { if File_manager_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_manager_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpsertManifestRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpsertManifestResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MarkForDeletionRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MarkForDeletionResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NextTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NextTaskResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskUpdateRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskUpdateResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListConfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListConfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetConfigRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetConfigResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateNodePoolRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateNodePoolResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskCompleteRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_manager_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskCompleteResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/manager_grpc.pb.go b/proto/pb/manager_grpc.pb.go index 999bca6bb..364580ba8 100644 --- a/proto/pb/manager_grpc.pb.go +++ b/proto/pb/manager_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: manager.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( ManagerService_UpsertManifest_FullMethodName = "/claudie.ManagerService/UpsertManifest" @@ -70,8 +70,9 @@ func NewManagerServiceClient(cc grpc.ClientConnInterface) ManagerServiceClient { } func (c *managerServiceClient) UpsertManifest(ctx context.Context, in *UpsertManifestRequest, opts ...grpc.CallOption) (*UpsertManifestResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UpsertManifestResponse) - err := c.cc.Invoke(ctx, ManagerService_UpsertManifest_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_UpsertManifest_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,8 +80,9 @@ func (c *managerServiceClient) UpsertManifest(ctx context.Context, in *UpsertMan } func (c *managerServiceClient) MarkForDeletion(ctx context.Context, in *MarkForDeletionRequest, opts ...grpc.CallOption) (*MarkForDeletionResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MarkForDeletionResponse) - err := c.cc.Invoke(ctx, ManagerService_MarkForDeletion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_MarkForDeletion_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -88,8 +90,9 @@ func (c *managerServiceClient) MarkForDeletion(ctx context.Context, in *MarkForD } func (c *managerServiceClient) ListConfigs(ctx context.Context, in *ListConfigRequest, opts ...grpc.CallOption) (*ListConfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListConfigResponse) - err := c.cc.Invoke(ctx, ManagerService_ListConfigs_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_ListConfigs_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -97,8 +100,9 @@ func (c *managerServiceClient) ListConfigs(ctx context.Context, in *ListConfigRe } func (c *managerServiceClient) GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*GetConfigResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetConfigResponse) - err := c.cc.Invoke(ctx, ManagerService_GetConfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_GetConfig_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -106,8 +110,9 @@ func (c *managerServiceClient) GetConfig(ctx context.Context, in *GetConfigReque } func (c *managerServiceClient) NextTask(ctx context.Context, in *NextTaskRequest, opts ...grpc.CallOption) (*NextTaskResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NextTaskResponse) - err := c.cc.Invoke(ctx, ManagerService_NextTask_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_NextTask_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -115,8 +120,9 @@ func (c *managerServiceClient) NextTask(ctx context.Context, in *NextTaskRequest } func (c *managerServiceClient) TaskUpdate(ctx context.Context, in *TaskUpdateRequest, opts ...grpc.CallOption) (*TaskUpdateResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TaskUpdateResponse) - err := c.cc.Invoke(ctx, ManagerService_TaskUpdate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_TaskUpdate_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -124,8 +130,9 @@ func (c *managerServiceClient) TaskUpdate(ctx context.Context, in *TaskUpdateReq } func (c *managerServiceClient) TaskComplete(ctx context.Context, in *TaskCompleteRequest, opts ...grpc.CallOption) (*TaskCompleteResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TaskCompleteResponse) - err := c.cc.Invoke(ctx, ManagerService_TaskComplete_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_TaskComplete_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -133,8 +140,9 @@ func (c *managerServiceClient) TaskComplete(ctx context.Context, in *TaskComplet } func (c *managerServiceClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*UpdateNodePoolResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UpdateNodePoolResponse) - err := c.cc.Invoke(ctx, ManagerService_UpdateNodePool_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ManagerService_UpdateNodePool_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -143,7 +151,7 @@ func (c *managerServiceClient) UpdateNodePool(ctx context.Context, in *UpdateNod // ManagerServiceServer is the server API for ManagerService service. // All implementations must embed UnimplementedManagerServiceServer -// for forward compatibility +// for forward compatibility. type ManagerServiceServer interface { // UpsertManifest will process the request by either created a new configuration for the // given input manifest or updating an existing one. @@ -174,9 +182,12 @@ type ManagerServiceServer interface { mustEmbedUnimplementedManagerServiceServer() } -// UnimplementedManagerServiceServer must be embedded to have forward compatible implementations. -type UnimplementedManagerServiceServer struct { -} +// UnimplementedManagerServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedManagerServiceServer struct{} func (UnimplementedManagerServiceServer) UpsertManifest(context.Context, *UpsertManifestRequest) (*UpsertManifestResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpsertManifest not implemented") @@ -203,6 +214,7 @@ func (UnimplementedManagerServiceServer) UpdateNodePool(context.Context, *Update return nil, status.Errorf(codes.Unimplemented, "method UpdateNodePool not implemented") } func (UnimplementedManagerServiceServer) mustEmbedUnimplementedManagerServiceServer() {} +func (UnimplementedManagerServiceServer) testEmbeddedByValue() {} // UnsafeManagerServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ManagerServiceServer will @@ -212,6 +224,13 @@ type UnsafeManagerServiceServer interface { } func RegisterManagerServiceServer(s grpc.ServiceRegistrar, srv ManagerServiceServer) { + // If the following call pancis, it indicates UnimplementedManagerServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&ManagerService_ServiceDesc, srv) } diff --git a/proto/pb/spec/dns.pb.go b/proto/pb/spec/dns.pb.go index f4280f98b..d8af5c31a 100644 --- a/proto/pb/spec/dns.pb.go +++ b/proto/pb/spec/dns.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: spec/dns.proto @@ -38,11 +38,9 @@ type DNS struct { func (x *DNS) Reset() { *x = DNS{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_dns_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_dns_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DNS) String() string { @@ -53,7 +51,7 @@ func (*DNS) ProtoMessage() {} func (x *DNS) ProtoReflect() protoreflect.Message { mi := &file_spec_dns_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -129,7 +127,7 @@ func file_spec_dns_proto_rawDescGZIP() []byte { } var file_spec_dns_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_spec_dns_proto_goTypes = []interface{}{ +var file_spec_dns_proto_goTypes = []any{ (*DNS)(nil), // 0: spec.DNS (*Provider)(nil), // 1: spec.Provider } @@ -148,20 +146,6 @@ func file_spec_dns_proto_init() { return } file_spec_provider_proto_init() - if !protoimpl.UnsafeEnabled { - file_spec_dns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DNS); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/spec/manifest.pb.go b/proto/pb/spec/manifest.pb.go index c8bb7451d..54937e51d 100644 --- a/proto/pb/spec/manifest.pb.go +++ b/proto/pb/spec/manifest.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: spec/manifest.proto @@ -349,6 +349,52 @@ func (Workflow_Status) EnumDescriptor() ([]byte, []int) { return file_spec_manifest_proto_rawDescGZIP(), []int{6, 1} } +type Retry_Repeat_Kind int32 + +const ( + Retry_Repeat_ENDLESS Retry_Repeat_Kind = 0 + Retry_Repeat_EXPONENTIAL Retry_Repeat_Kind = 1 +) + +// Enum value maps for Retry_Repeat_Kind. +var ( + Retry_Repeat_Kind_name = map[int32]string{ + 0: "ENDLESS", + 1: "EXPONENTIAL", + } + Retry_Repeat_Kind_value = map[string]int32{ + "ENDLESS": 0, + "EXPONENTIAL": 1, + } +) + +func (x Retry_Repeat_Kind) Enum() *Retry_Repeat_Kind { + p := new(Retry_Repeat_Kind) + *p = x + return p +} + +func (x Retry_Repeat_Kind) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (Retry_Repeat_Kind) Descriptor() protoreflect.EnumDescriptor { + return file_spec_manifest_proto_enumTypes[6].Descriptor() +} + +func (Retry_Repeat_Kind) Type() protoreflect.EnumType { + return &file_spec_manifest_proto_enumTypes[6] +} + +func (x Retry_Repeat_Kind) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use Retry_Repeat_Kind.Descriptor instead. +func (Retry_Repeat_Kind) EnumDescriptor() ([]byte, []int) { + return file_spec_manifest_proto_rawDescGZIP(), []int{15, 0, 0} +} + // Config holds data for a single manifest. type Config struct { state protoimpl.MessageState @@ -369,11 +415,9 @@ type Config struct { func (x *Config) Reset() { *x = Config{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Config) String() string { @@ -384,7 +428,7 @@ func (*Config) ProtoMessage() {} func (x *Config) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -447,11 +491,9 @@ type Manifest struct { func (x *Manifest) Reset() { *x = Manifest{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Manifest) String() string { @@ -462,7 +504,7 @@ func (*Manifest) ProtoMessage() {} func (x *Manifest) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -518,11 +560,9 @@ type ClusterState struct { func (x *ClusterState) Reset() { *x = ClusterState{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ClusterState) String() string { @@ -533,7 +573,7 @@ func (*ClusterState) ProtoMessage() {} func (x *ClusterState) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -587,11 +627,9 @@ type Clusters struct { func (x *Clusters) Reset() { *x = Clusters{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Clusters) String() string { @@ -602,7 +640,7 @@ func (*Clusters) ProtoMessage() {} func (x *Clusters) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -641,11 +679,9 @@ type LoadBalancers struct { func (x *LoadBalancers) Reset() { *x = LoadBalancers{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancers) String() string { @@ -656,7 +692,7 @@ func (*LoadBalancers) ProtoMessage() {} func (x *LoadBalancers) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -691,11 +727,9 @@ type KubernetesContext struct { func (x *KubernetesContext) Reset() { *x = KubernetesContext{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *KubernetesContext) String() string { @@ -706,7 +740,7 @@ func (*KubernetesContext) ProtoMessage() {} func (x *KubernetesContext) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -748,11 +782,9 @@ type Workflow struct { func (x *Workflow) Reset() { *x = Workflow{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Workflow) String() string { @@ -763,7 +795,7 @@ func (*Workflow) ProtoMessage() {} func (x *Workflow) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -819,11 +851,9 @@ type K8Scluster struct { func (x *K8Scluster) Reset() { *x = K8Scluster{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *K8Scluster) String() string { @@ -834,7 +864,7 @@ func (*K8Scluster) ProtoMessage() {} func (x *K8Scluster) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -903,11 +933,9 @@ type LBcluster struct { func (x *LBcluster) Reset() { *x = LBcluster{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LBcluster) String() string { @@ -918,7 +946,7 @@ func (*LBcluster) ProtoMessage() {} func (x *LBcluster) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -977,11 +1005,9 @@ type ClusterInfo struct { func (x *ClusterInfo) Reset() { *x = ClusterInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ClusterInfo) String() string { @@ -992,7 +1018,7 @@ func (*ClusterInfo) ProtoMessage() {} func (x *ClusterInfo) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1042,11 +1068,9 @@ type InstallationProxy struct { func (x *InstallationProxy) Reset() { *x = InstallationProxy{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InstallationProxy) String() string { @@ -1057,7 +1081,7 @@ func (*InstallationProxy) ProtoMessage() {} func (x *InstallationProxy) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1102,11 +1126,9 @@ type ProxyEnvs struct { func (x *ProxyEnvs) Reset() { *x = ProxyEnvs{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyEnvs) String() string { @@ -1117,7 +1139,7 @@ func (*ProxyEnvs) ProtoMessage() {} func (x *ProxyEnvs) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1175,11 +1197,9 @@ type Role struct { func (x *Role) Reset() { *x = Role{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Role) String() string { @@ -1190,7 +1210,7 @@ func (*Role) ProtoMessage() {} func (x *Role) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1259,11 +1279,9 @@ type Events struct { func (x *Events) Reset() { *x = Events{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Events) String() string { @@ -1274,7 +1292,7 @@ func (*Events) ProtoMessage() {} func (x *Events) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1320,16 +1338,14 @@ type TaskEvent struct { Event Event `protobuf:"varint,3,opt,name=event,proto3,enum=spec.Event" json:"event,omitempty"` Task *Task `protobuf:"bytes,4,opt,name=task,proto3" json:"task,omitempty"` Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` - OnError *RetryStrategy `protobuf:"bytes,6,opt,name=onError,proto3" json:"onError,omitempty"` + OnError *Retry `protobuf:"bytes,7,opt,name=onError,proto3" json:"onError,omitempty"` } func (x *TaskEvent) Reset() { *x = TaskEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TaskEvent) String() string { @@ -1340,7 +1356,7 @@ func (*TaskEvent) ProtoMessage() {} func (x *TaskEvent) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1390,40 +1406,41 @@ func (x *TaskEvent) GetDescription() string { return "" } -func (x *TaskEvent) GetOnError() *RetryStrategy { +func (x *TaskEvent) GetOnError() *Retry { if x != nil { return x.OnError } return nil } -type RetryStrategy struct { +type Retry struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Repeat bool `protobuf:"varint,1,opt,name=repeat,proto3" json:"repeat,omitempty"` - Rollback []*TaskEvent `protobuf:"bytes,2,rep,name=rollback,proto3" json:"rollback,omitempty"` + // Types that are assignable to Do: + // + // *Retry_Repeat_ + // *Retry_Rollback_ + Do isRetry_Do `protobuf_oneof:"Do"` } -func (x *RetryStrategy) Reset() { - *x = RetryStrategy{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } +func (x *Retry) Reset() { + *x = Retry{} + mi := &file_spec_manifest_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } -func (x *RetryStrategy) String() string { +func (x *Retry) String() string { return protoimpl.X.MessageStringOf(x) } -func (*RetryStrategy) ProtoMessage() {} +func (*Retry) ProtoMessage() {} -func (x *RetryStrategy) ProtoReflect() protoreflect.Message { +func (x *Retry) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1433,25 +1450,48 @@ func (x *RetryStrategy) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use RetryStrategy.ProtoReflect.Descriptor instead. -func (*RetryStrategy) Descriptor() ([]byte, []int) { +// Deprecated: Use Retry.ProtoReflect.Descriptor instead. +func (*Retry) Descriptor() ([]byte, []int) { return file_spec_manifest_proto_rawDescGZIP(), []int{15} } -func (x *RetryStrategy) GetRepeat() bool { - if x != nil { +func (m *Retry) GetDo() isRetry_Do { + if m != nil { + return m.Do + } + return nil +} + +func (x *Retry) GetRepeat() *Retry_Repeat { + if x, ok := x.GetDo().(*Retry_Repeat_); ok { return x.Repeat } - return false + return nil } -func (x *RetryStrategy) GetRollback() []*TaskEvent { - if x != nil { +func (x *Retry) GetRollback() *Retry_Rollback { + if x, ok := x.GetDo().(*Retry_Rollback_); ok { return x.Rollback } return nil } +type isRetry_Do interface { + isRetry_Do() +} + +type Retry_Repeat_ struct { + Repeat *Retry_Repeat `protobuf:"bytes,3,opt,name=repeat,proto3,oneof"` +} + +type Retry_Rollback_ struct { + Rollback *Retry_Rollback `protobuf:"bytes,4,opt,name=rollback,proto3,oneof"` +} + +func (*Retry_Repeat_) isRetry_Do() {} + +func (*Retry_Rollback_) isRetry_Do() {} + type Task struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1464,11 +1504,9 @@ type Task struct { func (x *Task) Reset() { *x = Task{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Task) String() string { @@ -1479,7 +1517,7 @@ func (*Task) ProtoMessage() {} func (x *Task) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1526,11 +1564,9 @@ type CreateState struct { func (x *CreateState) Reset() { *x = CreateState{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CreateState) String() string { @@ -1541,7 +1577,7 @@ func (*CreateState) ProtoMessage() {} func (x *CreateState) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1582,11 +1618,9 @@ type UpdateState struct { func (x *UpdateState) Reset() { *x = UpdateState{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateState) String() string { @@ -1597,7 +1631,7 @@ func (*UpdateState) ProtoMessage() {} func (x *UpdateState) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1645,11 +1679,9 @@ type DeleteState struct { func (x *DeleteState) Reset() { *x = DeleteState{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeleteState) String() string { @@ -1660,7 +1692,7 @@ func (*DeleteState) ProtoMessage() {} func (x *DeleteState) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1706,11 +1738,9 @@ type DeletedNodes struct { func (x *DeletedNodes) Reset() { *x = DeletedNodes{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DeletedNodes) String() string { @@ -1721,7 +1751,7 @@ func (*DeletedNodes) ProtoMessage() {} func (x *DeletedNodes) ProtoReflect() protoreflect.Message { mi := &file_spec_manifest_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1743,6 +1773,127 @@ func (x *DeletedNodes) GetNodes() []string { return nil } +type Retry_Repeat struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Kind Retry_Repeat_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=spec.Retry_Repeat_Kind" json:"kind,omitempty"` + // currentTick specifies the current number of ticks. + // A tick is an regular interval at which manifests are being checked. + // to check the Tick timeout see: manager/internal/service/watchers.go + CurrentTick uint32 `protobuf:"varint,2,opt,name=currentTick,proto3" json:"currentTick,omitempty"` + // stopAfter specifies the maximum number of ticks, after reaching this value the manifest will be rescheduled + // for the last time before giving up. + StopAfter uint32 `protobuf:"varint,3,opt,name=stopAfter,proto3" json:"stopAfter,omitempty"` + // retryAfter specifies the number of ticks to wait before rescheduling the manifest again. + // this value will be set to the value of currentTick after it is updated. + RetryAfter uint32 `protobuf:"varint,4,opt,name=retryAfter,proto3" json:"retryAfter,omitempty"` +} + +func (x *Retry_Repeat) Reset() { + *x = Retry_Repeat{} + mi := &file_spec_manifest_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Retry_Repeat) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Retry_Repeat) ProtoMessage() {} + +func (x *Retry_Repeat) ProtoReflect() protoreflect.Message { + mi := &file_spec_manifest_proto_msgTypes[22] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Retry_Repeat.ProtoReflect.Descriptor instead. +func (*Retry_Repeat) Descriptor() ([]byte, []int) { + return file_spec_manifest_proto_rawDescGZIP(), []int{15, 0} +} + +func (x *Retry_Repeat) GetKind() Retry_Repeat_Kind { + if x != nil { + return x.Kind + } + return Retry_Repeat_ENDLESS +} + +func (x *Retry_Repeat) GetCurrentTick() uint32 { + if x != nil { + return x.CurrentTick + } + return 0 +} + +func (x *Retry_Repeat) GetStopAfter() uint32 { + if x != nil { + return x.StopAfter + } + return 0 +} + +func (x *Retry_Repeat) GetRetryAfter() uint32 { + if x != nil { + return x.RetryAfter + } + return 0 +} + +type Retry_Rollback struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Tasks []*TaskEvent `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"` +} + +func (x *Retry_Rollback) Reset() { + *x = Retry_Rollback{} + mi := &file_spec_manifest_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Retry_Rollback) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Retry_Rollback) ProtoMessage() {} + +func (x *Retry_Rollback) ProtoReflect() protoreflect.Message { + mi := &file_spec_manifest_proto_msgTypes[23] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Retry_Rollback.ProtoReflect.Descriptor instead. +func (*Retry_Rollback) Descriptor() ([]byte, []int) { + return file_spec_manifest_proto_rawDescGZIP(), []int{15, 1} +} + +func (x *Retry_Rollback) GetTasks() []*TaskEvent { + if x != nil { + return x.Tasks + } + return nil +} + type UpdateState_Endpoint struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1754,11 +1905,9 @@ type UpdateState_Endpoint struct { func (x *UpdateState_Endpoint) Reset() { *x = UpdateState_Endpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_manifest_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_manifest_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdateState_Endpoint) String() string { @@ -1768,8 +1917,8 @@ func (x *UpdateState_Endpoint) String() string { func (*UpdateState_Endpoint) ProtoMessage() {} func (x *UpdateState_Endpoint) ProtoReflect() protoreflect.Message { - mi := &file_spec_manifest_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_spec_manifest_proto_msgTypes[24] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1946,7 +2095,7 @@ var file_spec_manifest_proto_rawDesc = []byte{ 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x64, 0x22, 0xe9, 0x01, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, + 0x61, 0x6c, 0x65, 0x64, 0x22, 0xe1, 0x01, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, @@ -1958,72 +2107,89 @@ var file_spec_manifest_proto_rawDesc = []byte{ 0x73, 0x70, 0x65, 0x63, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53, - 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x07, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x22, 0x54, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, - 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x12, 0x2b, 0x0a, 0x08, 0x72, 0x6f, 0x6c, - 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x70, - 0x65, 0x63, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x08, 0x72, 0x6f, - 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x22, 0xa5, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, - 0x33, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x70, 0x65, 0x63, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x75, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x0b, 0x64, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, - 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x52, 0x0b, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x58, - 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, + 0x6e, 0x12, 0x25, 0x0a, 0x07, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x52, + 0x07, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xe0, 0x02, 0x0a, 0x05, 0x52, 0x65, 0x74, + 0x72, 0x79, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x2e, + 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x12, 0x32, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x2e, + 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x1a, 0xbb, 0x01, 0x0a, 0x06, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x12, + 0x2b, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, + 0x73, 0x70, 0x65, 0x63, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x2e, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x20, 0x0a, 0x0b, + 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x63, 0x6b, 0x12, 0x1c, + 0x0a, 0x09, 0x73, 0x74, 0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x09, 0x73, 0x74, 0x6f, 0x70, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, + 0x72, 0x65, 0x74, 0x72, 0x79, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x0a, 0x72, 0x65, 0x74, 0x72, 0x79, 0x41, 0x66, 0x74, 0x65, 0x72, 0x22, 0x24, 0x0a, 0x04, + 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0b, 0x0a, 0x07, 0x45, 0x4e, 0x44, 0x4c, 0x45, 0x53, 0x53, 0x10, + 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x49, 0x41, 0x4c, + 0x10, 0x01, 0x1a, 0x31, 0x0a, 0x08, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x12, 0x25, + 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, + 0x73, 0x70, 0x65, 0x63, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x05, + 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x04, 0x0a, 0x02, 0x44, 0x6f, 0x22, 0xa5, 0x01, 0x0a, 0x04, + 0x54, 0x61, 0x73, 0x6b, 0x12, 0x33, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x70, 0x65, 0x63, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x0b, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, + 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x52, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, + 0x0a, 0x0b, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x38, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4b, 0x38, 0x73, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x52, 0x03, 0x6b, 0x38, 0x73, 0x12, 0x25, 0x0a, 0x03, 0x6c, 0x62, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x73, 0x52, 0x03, 0x6c, 0x62, 0x73, 0x22, 0xcc, 0x01, + 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x38, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4b, 0x38, 0x73, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x03, 0x6b, 0x38, 0x73, 0x12, 0x25, 0x0a, 0x03, 0x6c, 0x62, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, - 0x65, 0x72, 0x73, 0x52, 0x03, 0x6c, 0x62, 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x38, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4b, 0x38, 0x73, - 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x03, 0x6b, 0x38, 0x73, 0x12, 0x25, 0x0a, 0x03, - 0x6c, 0x62, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x65, 0x63, - 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x73, 0x52, 0x03, - 0x6c, 0x62, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, - 0x74, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x1a, 0x3a, 0x0a, 0x08, 0x45, - 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x70, - 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x70, - 0x6f, 0x6f, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0xea, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x38, 0x73, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4b, 0x38, 0x73, 0x63, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x03, 0x6b, 0x38, 0x73, 0x12, 0x25, 0x0a, 0x03, 0x6c, - 0x62, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, - 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x73, 0x52, 0x03, 0x6c, - 0x62, 0x73, 0x12, 0x3e, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, - 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, - 0x6c, 0x73, 0x1a, 0x50, 0x0a, 0x0e, 0x4e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x28, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x4e, - 0x6f, 0x64, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x2a, 0x26, 0x0a, 0x08, 0x52, 0x6f, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, - 0x76, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, - 0x10, 0x01, 0x2a, 0x1e, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x07, 0x0a, 0x03, 0x4b, 0x38, 0x73, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x4c, 0x42, - 0x10, 0x01, 0x2a, 0x38, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, - 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x52, 0x45, 0x41, - 0x54, 0x45, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, - 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x03, 0x42, 0x29, 0x5a, 0x27, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x65, 0x72, 0x6f, 0x70, - 0x73, 0x2f, 0x63, 0x6c, 0x61, 0x75, 0x64, 0x69, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x70, 0x62, 0x2f, 0x73, 0x70, 0x65, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x73, 0x52, 0x03, 0x6c, 0x62, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x65, + 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, + 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, + 0x1a, 0x3a, 0x0a, 0x08, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x6e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x6e, 0x6f, 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0xea, 0x01, 0x0a, + 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x03, + 0x6b, 0x38, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x65, 0x63, + 0x2e, 0x4b, 0x38, 0x73, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x03, 0x6b, 0x38, 0x73, + 0x12, 0x25, 0x0a, 0x03, 0x6c, 0x62, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x73, 0x70, 0x65, 0x63, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, + 0x72, 0x73, 0x52, 0x03, 0x6c, 0x62, 0x73, 0x12, 0x3e, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x70, + 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x70, 0x65, + 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4e, 0x6f, + 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6e, 0x6f, + 0x64, 0x65, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x1a, 0x50, 0x0a, 0x0e, 0x4e, 0x6f, 0x64, 0x65, 0x70, + 0x6f, 0x6f, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x28, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x65, + 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x0c, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x64, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x2a, + 0x26, 0x0a, 0x08, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, + 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, + 0x67, 0x72, 0x65, 0x73, 0x73, 0x10, 0x01, 0x2a, 0x1e, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x4b, 0x38, 0x73, 0x10, 0x00, 0x12, + 0x06, 0x0a, 0x02, 0x4c, 0x42, 0x10, 0x01, 0x2a, 0x38, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, + 0x06, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x50, 0x44, + 0x41, 0x54, 0x45, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, + 0x03, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x62, 0x65, 0x72, 0x6f, 0x70, 0x73, 0x2f, 0x63, 0x6c, 0x61, 0x75, 0x64, 0x69, 0x65, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x2f, 0x73, 0x70, 0x65, 0x63, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2038,88 +2204,94 @@ func file_spec_manifest_proto_rawDescGZIP() []byte { return file_spec_manifest_proto_rawDescData } -var file_spec_manifest_proto_enumTypes = make([]protoimpl.EnumInfo, 6) -var file_spec_manifest_proto_msgTypes = make([]protoimpl.MessageInfo, 24) -var file_spec_manifest_proto_goTypes = []interface{}{ +var file_spec_manifest_proto_enumTypes = make([]protoimpl.EnumInfo, 7) +var file_spec_manifest_proto_msgTypes = make([]protoimpl.MessageInfo, 26) +var file_spec_manifest_proto_goTypes = []any{ (RoleType)(0), // 0: spec.RoleType (ClusterType)(0), // 1: spec.ClusterType (Event)(0), // 2: spec.Event (Manifest_State)(0), // 3: spec.Manifest.State (Workflow_Stage)(0), // 4: spec.Workflow.Stage (Workflow_Status)(0), // 5: spec.Workflow.Status - (*Config)(nil), // 6: spec.Config - (*Manifest)(nil), // 7: spec.Manifest - (*ClusterState)(nil), // 8: spec.ClusterState - (*Clusters)(nil), // 9: spec.Clusters - (*LoadBalancers)(nil), // 10: spec.LoadBalancers - (*KubernetesContext)(nil), // 11: spec.KubernetesContext - (*Workflow)(nil), // 12: spec.Workflow - (*K8Scluster)(nil), // 13: spec.K8scluster - (*LBcluster)(nil), // 14: spec.LBcluster - (*ClusterInfo)(nil), // 15: spec.ClusterInfo - (*InstallationProxy)(nil), // 16: spec.InstallationProxy - (*ProxyEnvs)(nil), // 17: spec.ProxyEnvs - (*Role)(nil), // 18: spec.Role - (*Events)(nil), // 19: spec.Events - (*TaskEvent)(nil), // 20: spec.TaskEvent - (*RetryStrategy)(nil), // 21: spec.RetryStrategy - (*Task)(nil), // 22: spec.Task - (*CreateState)(nil), // 23: spec.CreateState - (*UpdateState)(nil), // 24: spec.UpdateState - (*DeleteState)(nil), // 25: spec.DeleteState - (*DeletedNodes)(nil), // 26: spec.DeletedNodes - nil, // 27: spec.Config.ClustersEntry - (*UpdateState_Endpoint)(nil), // 28: spec.UpdateState.Endpoint - nil, // 29: spec.DeleteState.NodepoolsEntry - (*DNS)(nil), // 30: spec.DNS - (*NodePool)(nil), // 31: spec.NodePool - (*timestamppb.Timestamp)(nil), // 32: google.protobuf.Timestamp + (Retry_Repeat_Kind)(0), // 6: spec.Retry.Repeat.Kind + (*Config)(nil), // 7: spec.Config + (*Manifest)(nil), // 8: spec.Manifest + (*ClusterState)(nil), // 9: spec.ClusterState + (*Clusters)(nil), // 10: spec.Clusters + (*LoadBalancers)(nil), // 11: spec.LoadBalancers + (*KubernetesContext)(nil), // 12: spec.KubernetesContext + (*Workflow)(nil), // 13: spec.Workflow + (*K8Scluster)(nil), // 14: spec.K8scluster + (*LBcluster)(nil), // 15: spec.LBcluster + (*ClusterInfo)(nil), // 16: spec.ClusterInfo + (*InstallationProxy)(nil), // 17: spec.InstallationProxy + (*ProxyEnvs)(nil), // 18: spec.ProxyEnvs + (*Role)(nil), // 19: spec.Role + (*Events)(nil), // 20: spec.Events + (*TaskEvent)(nil), // 21: spec.TaskEvent + (*Retry)(nil), // 22: spec.Retry + (*Task)(nil), // 23: spec.Task + (*CreateState)(nil), // 24: spec.CreateState + (*UpdateState)(nil), // 25: spec.UpdateState + (*DeleteState)(nil), // 26: spec.DeleteState + (*DeletedNodes)(nil), // 27: spec.DeletedNodes + nil, // 28: spec.Config.ClustersEntry + (*Retry_Repeat)(nil), // 29: spec.Retry.Repeat + (*Retry_Rollback)(nil), // 30: spec.Retry.Rollback + (*UpdateState_Endpoint)(nil), // 31: spec.UpdateState.Endpoint + nil, // 32: spec.DeleteState.NodepoolsEntry + (*DNS)(nil), // 33: spec.DNS + (*NodePool)(nil), // 34: spec.NodePool + (*timestamppb.Timestamp)(nil), // 35: google.protobuf.Timestamp } var file_spec_manifest_proto_depIdxs = []int32{ - 11, // 0: spec.Config.k8sCtx:type_name -> spec.KubernetesContext - 7, // 1: spec.Config.manifest:type_name -> spec.Manifest - 27, // 2: spec.Config.clusters:type_name -> spec.Config.ClustersEntry + 12, // 0: spec.Config.k8sCtx:type_name -> spec.KubernetesContext + 8, // 1: spec.Config.manifest:type_name -> spec.Manifest + 28, // 2: spec.Config.clusters:type_name -> spec.Config.ClustersEntry 3, // 3: spec.Manifest.state:type_name -> spec.Manifest.State - 9, // 4: spec.ClusterState.current:type_name -> spec.Clusters - 9, // 5: spec.ClusterState.desired:type_name -> spec.Clusters - 19, // 6: spec.ClusterState.events:type_name -> spec.Events - 12, // 7: spec.ClusterState.state:type_name -> spec.Workflow - 13, // 8: spec.Clusters.k8s:type_name -> spec.K8scluster - 10, // 9: spec.Clusters.loadBalancers:type_name -> spec.LoadBalancers - 14, // 10: spec.LoadBalancers.clusters:type_name -> spec.LBcluster + 10, // 4: spec.ClusterState.current:type_name -> spec.Clusters + 10, // 5: spec.ClusterState.desired:type_name -> spec.Clusters + 20, // 6: spec.ClusterState.events:type_name -> spec.Events + 13, // 7: spec.ClusterState.state:type_name -> spec.Workflow + 14, // 8: spec.Clusters.k8s:type_name -> spec.K8scluster + 11, // 9: spec.Clusters.loadBalancers:type_name -> spec.LoadBalancers + 15, // 10: spec.LoadBalancers.clusters:type_name -> spec.LBcluster 4, // 11: spec.Workflow.stage:type_name -> spec.Workflow.Stage 5, // 12: spec.Workflow.status:type_name -> spec.Workflow.Status - 15, // 13: spec.K8scluster.clusterInfo:type_name -> spec.ClusterInfo - 16, // 14: spec.K8scluster.installationProxy:type_name -> spec.InstallationProxy - 15, // 15: spec.LBcluster.clusterInfo:type_name -> spec.ClusterInfo - 18, // 16: spec.LBcluster.roles:type_name -> spec.Role - 30, // 17: spec.LBcluster.dns:type_name -> spec.DNS - 31, // 18: spec.ClusterInfo.nodePools:type_name -> spec.NodePool + 16, // 13: spec.K8scluster.clusterInfo:type_name -> spec.ClusterInfo + 17, // 14: spec.K8scluster.installationProxy:type_name -> spec.InstallationProxy + 16, // 15: spec.LBcluster.clusterInfo:type_name -> spec.ClusterInfo + 19, // 16: spec.LBcluster.roles:type_name -> spec.Role + 33, // 17: spec.LBcluster.dns:type_name -> spec.DNS + 34, // 18: spec.ClusterInfo.nodePools:type_name -> spec.NodePool 0, // 19: spec.Role.roleType:type_name -> spec.RoleType - 20, // 20: spec.Events.events:type_name -> spec.TaskEvent - 32, // 21: spec.TaskEvent.timestamp:type_name -> google.protobuf.Timestamp + 21, // 20: spec.Events.events:type_name -> spec.TaskEvent + 35, // 21: spec.TaskEvent.timestamp:type_name -> google.protobuf.Timestamp 2, // 22: spec.TaskEvent.event:type_name -> spec.Event - 22, // 23: spec.TaskEvent.task:type_name -> spec.Task - 21, // 24: spec.TaskEvent.onError:type_name -> spec.RetryStrategy - 20, // 25: spec.RetryStrategy.rollback:type_name -> spec.TaskEvent - 23, // 26: spec.Task.createState:type_name -> spec.CreateState - 24, // 27: spec.Task.updateState:type_name -> spec.UpdateState - 25, // 28: spec.Task.deleteState:type_name -> spec.DeleteState - 13, // 29: spec.CreateState.k8s:type_name -> spec.K8scluster - 10, // 30: spec.CreateState.lbs:type_name -> spec.LoadBalancers - 13, // 31: spec.UpdateState.k8s:type_name -> spec.K8scluster - 10, // 32: spec.UpdateState.lbs:type_name -> spec.LoadBalancers - 28, // 33: spec.UpdateState.endpoint:type_name -> spec.UpdateState.Endpoint - 13, // 34: spec.DeleteState.k8s:type_name -> spec.K8scluster - 10, // 35: spec.DeleteState.lbs:type_name -> spec.LoadBalancers - 29, // 36: spec.DeleteState.nodepools:type_name -> spec.DeleteState.NodepoolsEntry - 8, // 37: spec.Config.ClustersEntry.value:type_name -> spec.ClusterState - 26, // 38: spec.DeleteState.NodepoolsEntry.value:type_name -> spec.DeletedNodes - 39, // [39:39] is the sub-list for method output_type - 39, // [39:39] is the sub-list for method input_type - 39, // [39:39] is the sub-list for extension type_name - 39, // [39:39] is the sub-list for extension extendee - 0, // [0:39] is the sub-list for field type_name + 23, // 23: spec.TaskEvent.task:type_name -> spec.Task + 22, // 24: spec.TaskEvent.onError:type_name -> spec.Retry + 29, // 25: spec.Retry.repeat:type_name -> spec.Retry.Repeat + 30, // 26: spec.Retry.rollback:type_name -> spec.Retry.Rollback + 24, // 27: spec.Task.createState:type_name -> spec.CreateState + 25, // 28: spec.Task.updateState:type_name -> spec.UpdateState + 26, // 29: spec.Task.deleteState:type_name -> spec.DeleteState + 14, // 30: spec.CreateState.k8s:type_name -> spec.K8scluster + 11, // 31: spec.CreateState.lbs:type_name -> spec.LoadBalancers + 14, // 32: spec.UpdateState.k8s:type_name -> spec.K8scluster + 11, // 33: spec.UpdateState.lbs:type_name -> spec.LoadBalancers + 31, // 34: spec.UpdateState.endpoint:type_name -> spec.UpdateState.Endpoint + 14, // 35: spec.DeleteState.k8s:type_name -> spec.K8scluster + 11, // 36: spec.DeleteState.lbs:type_name -> spec.LoadBalancers + 32, // 37: spec.DeleteState.nodepools:type_name -> spec.DeleteState.NodepoolsEntry + 9, // 38: spec.Config.ClustersEntry.value:type_name -> spec.ClusterState + 6, // 39: spec.Retry.Repeat.kind:type_name -> spec.Retry.Repeat.Kind + 21, // 40: spec.Retry.Rollback.tasks:type_name -> spec.TaskEvent + 27, // 41: spec.DeleteState.NodepoolsEntry.value:type_name -> spec.DeletedNodes + 42, // [42:42] is the sub-list for method output_type + 42, // [42:42] is the sub-list for method input_type + 42, // [42:42] is the sub-list for extension type_name + 42, // [42:42] is the sub-list for extension extendee + 0, // [0:42] is the sub-list for field type_name } func init() { file_spec_manifest_proto_init() } @@ -2129,279 +2301,17 @@ func file_spec_manifest_proto_init() { } file_spec_nodepool_proto_init() file_spec_dns_proto_init() - if !protoimpl.UnsafeEnabled { - file_spec_manifest_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Manifest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ClusterState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Clusters); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancers); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*KubernetesContext); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Workflow); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*K8Scluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LBcluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ClusterInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InstallationProxy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyEnvs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Role); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Events); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryStrategy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Task); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeletedNodes); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_manifest_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateState_Endpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } + file_spec_manifest_proto_msgTypes[15].OneofWrappers = []any{ + (*Retry_Repeat_)(nil), + (*Retry_Rollback_)(nil), } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_spec_manifest_proto_rawDesc, - NumEnums: 6, - NumMessages: 24, + NumEnums: 7, + NumMessages: 26, NumExtensions: 0, NumServices: 0, }, diff --git a/proto/pb/spec/nodepool.pb.go b/proto/pb/spec/nodepool.pb.go index 8961623e5..eeea12ffc 100644 --- a/proto/pb/spec/nodepool.pb.go +++ b/proto/pb/spec/nodepool.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: spec/nodepool.proto @@ -152,11 +152,9 @@ type NodePool struct { func (x *NodePool) Reset() { *x = NodePool{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodePool) String() string { @@ -167,7 +165,7 @@ func (*NodePool) ProtoMessage() {} func (x *NodePool) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -277,11 +275,9 @@ type Taint struct { func (x *Taint) Reset() { *x = Taint{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Taint) String() string { @@ -292,7 +288,7 @@ func (*Taint) ProtoMessage() {} func (x *Taint) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -348,11 +344,9 @@ type Node struct { func (x *Node) Reset() { *x = Node{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Node) String() string { @@ -363,7 +357,7 @@ func (*Node) ProtoMessage() {} func (x *Node) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -446,11 +440,9 @@ type DynamicNodePool struct { func (x *DynamicNodePool) Reset() { *x = DynamicNodePool{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DynamicNodePool) String() string { @@ -461,7 +453,7 @@ func (*DynamicNodePool) ProtoMessage() {} func (x *DynamicNodePool) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -572,11 +564,9 @@ type MachineSpec struct { func (x *MachineSpec) Reset() { *x = MachineSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineSpec) String() string { @@ -587,7 +577,7 @@ func (*MachineSpec) ProtoMessage() {} func (x *MachineSpec) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -630,11 +620,9 @@ type AutoscalerConf struct { func (x *AutoscalerConf) Reset() { *x = AutoscalerConf{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AutoscalerConf) String() string { @@ -645,7 +633,7 @@ func (*AutoscalerConf) ProtoMessage() {} func (x *AutoscalerConf) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -686,11 +674,9 @@ type StaticNodePool struct { func (x *StaticNodePool) Reset() { *x = StaticNodePool{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_nodepool_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_nodepool_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StaticNodePool) String() string { @@ -701,7 +687,7 @@ func (*StaticNodePool) ProtoMessage() {} func (x *StaticNodePool) ProtoReflect() protoreflect.Message { mi := &file_spec_nodepool_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -846,7 +832,7 @@ func file_spec_nodepool_proto_rawDescGZIP() []byte { var file_spec_nodepool_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_spec_nodepool_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_spec_nodepool_proto_goTypes = []interface{}{ +var file_spec_nodepool_proto_goTypes = []any{ (NodeType)(0), // 0: spec.NodeType (StaticNodepoolInfo)(0), // 1: spec.StaticNodepoolInfo (*NodePool)(nil), // 2: spec.NodePool @@ -886,93 +872,7 @@ func file_spec_nodepool_proto_init() { return } file_spec_provider_proto_init() - if !protoimpl.UnsafeEnabled { - file_spec_nodepool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodePool); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Taint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Node); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DynamicNodePool); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MachineSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AutoscalerConf); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_nodepool_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StaticNodePool); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_spec_nodepool_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_spec_nodepool_proto_msgTypes[0].OneofWrappers = []any{ (*NodePool_DynamicNodePool)(nil), (*NodePool_StaticNodePool)(nil), } diff --git a/proto/pb/spec/provider.pb.go b/proto/pb/spec/provider.pb.go index 291340098..e12b865e9 100644 --- a/proto/pb/spec/provider.pb.go +++ b/proto/pb/spec/provider.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: spec/provider.proto @@ -31,11 +31,9 @@ type GCPProvider struct { func (x *GCPProvider) Reset() { *x = GCPProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GCPProvider) String() string { @@ -46,7 +44,7 @@ func (*GCPProvider) ProtoMessage() {} func (x *GCPProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -85,11 +83,9 @@ type HetznerProvider struct { func (x *HetznerProvider) Reset() { *x = HetznerProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HetznerProvider) String() string { @@ -100,7 +96,7 @@ func (*HetznerProvider) ProtoMessage() {} func (x *HetznerProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -132,11 +128,9 @@ type HetznerDNSProvider struct { func (x *HetznerDNSProvider) Reset() { *x = HetznerDNSProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HetznerDNSProvider) String() string { @@ -147,7 +141,7 @@ func (*HetznerDNSProvider) ProtoMessage() {} func (x *HetznerDNSProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -183,11 +177,9 @@ type OCIProvider struct { func (x *OCIProvider) Reset() { *x = OCIProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OCIProvider) String() string { @@ -198,7 +190,7 @@ func (*OCIProvider) ProtoMessage() {} func (x *OCIProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -259,11 +251,9 @@ type AWSProvider struct { func (x *AWSProvider) Reset() { *x = AWSProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AWSProvider) String() string { @@ -274,7 +264,7 @@ func (*AWSProvider) ProtoMessage() {} func (x *AWSProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -316,11 +306,9 @@ type AzureProvider struct { func (x *AzureProvider) Reset() { *x = AzureProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AzureProvider) String() string { @@ -331,7 +319,7 @@ func (*AzureProvider) ProtoMessage() {} func (x *AzureProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -384,11 +372,9 @@ type CloudflareProvider struct { func (x *CloudflareProvider) Reset() { *x = CloudflareProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CloudflareProvider) String() string { @@ -399,7 +385,7 @@ func (*CloudflareProvider) ProtoMessage() {} func (x *CloudflareProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -431,11 +417,9 @@ type GenesisCloudProvider struct { func (x *GenesisCloudProvider) Reset() { *x = GenesisCloudProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GenesisCloudProvider) String() string { @@ -446,7 +430,7 @@ func (*GenesisCloudProvider) ProtoMessage() {} func (x *GenesisCloudProvider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -491,11 +475,9 @@ type Provider struct { func (x *Provider) Reset() { *x = Provider{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Provider) String() string { @@ -506,7 +488,7 @@ func (*Provider) ProtoMessage() {} func (x *Provider) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -670,11 +652,9 @@ type TemplateRepository struct { func (x *TemplateRepository) Reset() { *x = TemplateRepository{} - if protoimpl.UnsafeEnabled { - mi := &file_spec_provider_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_spec_provider_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TemplateRepository) String() string { @@ -685,7 +665,7 @@ func (*TemplateRepository) ProtoMessage() {} func (x *TemplateRepository) ProtoReflect() protoreflect.Message { mi := &file_spec_provider_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -836,7 +816,7 @@ func file_spec_provider_proto_rawDescGZIP() []byte { } var file_spec_provider_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_spec_provider_proto_goTypes = []interface{}{ +var file_spec_provider_proto_goTypes = []any{ (*GCPProvider)(nil), // 0: spec.GCPProvider (*HetznerProvider)(nil), // 1: spec.HetznerProvider (*HetznerDNSProvider)(nil), // 2: spec.HetznerDNSProvider @@ -870,129 +850,7 @@ func file_spec_provider_proto_init() { if File_spec_provider_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_spec_provider_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GCPProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HetznerProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HetznerDNSProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OCIProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AWSProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AzureProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CloudflareProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GenesisCloudProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Provider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_spec_provider_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TemplateRepository); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_spec_provider_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_spec_provider_proto_msgTypes[8].OneofWrappers = []any{ (*Provider_Gcp)(nil), (*Provider_Hetzner)(nil), (*Provider_Hetznerdns)(nil), @@ -1002,7 +860,7 @@ func file_spec_provider_proto_init() { (*Provider_Cloudflare)(nil), (*Provider_Genesiscloud)(nil), } - file_spec_provider_proto_msgTypes[9].OneofWrappers = []interface{}{} + file_spec_provider_proto_msgTypes[9].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/pb/terraformer.pb.go b/proto/pb/terraformer.pb.go index d4cdb984d..73eec8802 100644 --- a/proto/pb/terraformer.pb.go +++ b/proto/pb/terraformer.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.35.2 // protoc v5.27.1 // source: terraformer.proto @@ -35,11 +35,9 @@ type BuildInfrastructureRequest struct { func (x *BuildInfrastructureRequest) Reset() { *x = BuildInfrastructureRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_terraformer_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_terraformer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildInfrastructureRequest) String() string { @@ -50,7 +48,7 @@ func (*BuildInfrastructureRequest) ProtoMessage() {} func (x *BuildInfrastructureRequest) ProtoReflect() protoreflect.Message { mi := &file_terraformer_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -114,11 +112,9 @@ type BuildInfrastructureResponse struct { func (x *BuildInfrastructureResponse) Reset() { *x = BuildInfrastructureResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_terraformer_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_terraformer_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildInfrastructureResponse) String() string { @@ -129,7 +125,7 @@ func (*BuildInfrastructureResponse) ProtoMessage() {} func (x *BuildInfrastructureResponse) ProtoReflect() protoreflect.Message { mi := &file_terraformer_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -193,11 +189,9 @@ type DestroyInfrastructureRequest struct { func (x *DestroyInfrastructureRequest) Reset() { *x = DestroyInfrastructureRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_terraformer_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_terraformer_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyInfrastructureRequest) String() string { @@ -208,7 +202,7 @@ func (*DestroyInfrastructureRequest) ProtoMessage() {} func (x *DestroyInfrastructureRequest) ProtoReflect() protoreflect.Message { mi := &file_terraformer_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -255,11 +249,9 @@ type DestroyInfrastructureResponse struct { func (x *DestroyInfrastructureResponse) Reset() { *x = DestroyInfrastructureResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_terraformer_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_terraformer_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestroyInfrastructureResponse) String() string { @@ -270,7 +262,7 @@ func (*DestroyInfrastructureResponse) ProtoMessage() {} func (x *DestroyInfrastructureResponse) ProtoReflect() protoreflect.Message { mi := &file_terraformer_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -311,11 +303,9 @@ type BuildInfrastructureResponse_InfrastructureData struct { func (x *BuildInfrastructureResponse_InfrastructureData) Reset() { *x = BuildInfrastructureResponse_InfrastructureData{} - if protoimpl.UnsafeEnabled { - mi := &file_terraformer_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_terraformer_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildInfrastructureResponse_InfrastructureData) String() string { @@ -326,7 +316,7 @@ func (*BuildInfrastructureResponse_InfrastructureData) ProtoMessage() {} func (x *BuildInfrastructureResponse_InfrastructureData) ProtoReflect() protoreflect.Message { mi := &file_terraformer_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -454,7 +444,7 @@ func file_terraformer_proto_rawDescGZIP() []byte { } var file_terraformer_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_terraformer_proto_goTypes = []interface{}{ +var file_terraformer_proto_goTypes = []any{ (*BuildInfrastructureRequest)(nil), // 0: claudie.BuildInfrastructureRequest (*BuildInfrastructureResponse)(nil), // 1: claudie.BuildInfrastructureResponse (*DestroyInfrastructureRequest)(nil), // 2: claudie.DestroyInfrastructureRequest @@ -492,69 +482,7 @@ func file_terraformer_proto_init() { if File_terraformer_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_terraformer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildInfrastructureRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_terraformer_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildInfrastructureResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_terraformer_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyInfrastructureRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_terraformer_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestroyInfrastructureResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_terraformer_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildInfrastructureResponse_InfrastructureData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_terraformer_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_terraformer_proto_msgTypes[1].OneofWrappers = []any{ (*BuildInfrastructureResponse_Ok)(nil), (*BuildInfrastructureResponse_Fail)(nil), } diff --git a/proto/pb/terraformer_grpc.pb.go b/proto/pb/terraformer_grpc.pb.go index 7fc0219ee..100949883 100644 --- a/proto/pb/terraformer_grpc.pb.go +++ b/proto/pb/terraformer_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v5.27.1 // source: terraformer.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( TerraformerService_BuildInfrastructure_FullMethodName = "/claudie.TerraformerService/BuildInfrastructure" @@ -42,8 +42,9 @@ func NewTerraformerServiceClient(cc grpc.ClientConnInterface) TerraformerService } func (c *terraformerServiceClient) BuildInfrastructure(ctx context.Context, in *BuildInfrastructureRequest, opts ...grpc.CallOption) (*BuildInfrastructureResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BuildInfrastructureResponse) - err := c.cc.Invoke(ctx, TerraformerService_BuildInfrastructure_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, TerraformerService_BuildInfrastructure_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -51,8 +52,9 @@ func (c *terraformerServiceClient) BuildInfrastructure(ctx context.Context, in * } func (c *terraformerServiceClient) DestroyInfrastructure(ctx context.Context, in *DestroyInfrastructureRequest, opts ...grpc.CallOption) (*DestroyInfrastructureResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DestroyInfrastructureResponse) - err := c.cc.Invoke(ctx, TerraformerService_DestroyInfrastructure_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, TerraformerService_DestroyInfrastructure_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -61,7 +63,7 @@ func (c *terraformerServiceClient) DestroyInfrastructure(ctx context.Context, in // TerraformerServiceServer is the server API for TerraformerService service. // All implementations must embed UnimplementedTerraformerServiceServer -// for forward compatibility +// for forward compatibility. type TerraformerServiceServer interface { // BuildInfrastructure builds the infrastructure based on the provided desired state (includes addition/deletion of *stuff*). BuildInfrastructure(context.Context, *BuildInfrastructureRequest) (*BuildInfrastructureResponse, error) @@ -70,9 +72,12 @@ type TerraformerServiceServer interface { mustEmbedUnimplementedTerraformerServiceServer() } -// UnimplementedTerraformerServiceServer must be embedded to have forward compatible implementations. -type UnimplementedTerraformerServiceServer struct { -} +// UnimplementedTerraformerServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedTerraformerServiceServer struct{} func (UnimplementedTerraformerServiceServer) BuildInfrastructure(context.Context, *BuildInfrastructureRequest) (*BuildInfrastructureResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method BuildInfrastructure not implemented") @@ -81,6 +86,7 @@ func (UnimplementedTerraformerServiceServer) DestroyInfrastructure(context.Conte return nil, status.Errorf(codes.Unimplemented, "method DestroyInfrastructure not implemented") } func (UnimplementedTerraformerServiceServer) mustEmbedUnimplementedTerraformerServiceServer() {} +func (UnimplementedTerraformerServiceServer) testEmbeddedByValue() {} // UnsafeTerraformerServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to TerraformerServiceServer will @@ -90,6 +96,13 @@ type UnsafeTerraformerServiceServer interface { } func RegisterTerraformerServiceServer(s grpc.ServiceRegistrar, srv TerraformerServiceServer) { + // If the following call pancis, it indicates UnimplementedTerraformerServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&TerraformerService_ServiceDesc, srv) } diff --git a/proto/spec/manifest.proto b/proto/spec/manifest.proto index 1b92ceaca..302141ed2 100644 --- a/proto/spec/manifest.proto +++ b/proto/spec/manifest.proto @@ -200,12 +200,35 @@ message TaskEvent { Event event = 3; Task task = 4; string description = 5; - RetryStrategy onError = 6; + Retry onError = 7; } -message RetryStrategy { - bool repeat = 1; - repeated TaskEvent rollback = 2; +message Retry { + message Repeat { + enum Kind { + ENDLESS = 0; + EXPONENTIAL = 1; + } + Kind kind = 1; + // currentTick specifies the current number of ticks. + // A tick is an regular interval at which manifests are being checked. + // to check the Tick timeout see: manager/internal/service/watchers.go + uint32 currentTick = 2; + // stopAfter specifies the maximum number of ticks, after reaching this value the manifest will be rescheduled + // for the last time before giving up. + uint32 stopAfter = 3; + // retryAfter specifies the number of ticks to wait before rescheduling the manifest again. + // this value will be set to the value of currentTick after it is updated. + uint32 retryAfter = 4; + } + message Rollback { + repeated TaskEvent tasks = 1; + } + + oneof Do { + Repeat repeat = 3; + Rollback rollback = 4; + } } message Task { diff --git a/services/builder/domain/usecases/config_processor_v2.go b/services/builder/domain/usecases/config_processor_v2.go index 2cd2f016d..ea07f4bb7 100644 --- a/services/builder/domain/usecases/config_processor_v2.go +++ b/services/builder/domain/usecases/config_processor_v2.go @@ -17,11 +17,6 @@ import ( "google.golang.org/protobuf/proto" ) -const ( - // maxDeleteRetry defines how many times the config should try to be deleted before returning an error, if encountered. - maxDeleteRetry = 3 -) - func (u *Usecases) TaskProcessor(wg *sync.WaitGroup) error { ctx := context.Background() @@ -301,22 +296,21 @@ func (u *Usecases) executeDeleteTask(te *managerclient.NextTaskResponse) (*spec. Workflow: te.State, } - var err error - for i := 0; i < maxDeleteRetry; i++ { - if err = u.destroyCluster(ctx); err == nil { - if clusterDeletion { - return nil, nil, nil - } else { - currentLbs := te.Current.GetLoadBalancers().GetClusters() - for _, deleted := range te.Event.Task.DeleteState.GetLbs().GetClusters() { - currentLbs = slices.DeleteFunc(currentLbs, func(bcluster *spec.LBcluster) bool { - return deleted.ClusterInfo.Name == bcluster.ClusterInfo.Name - }) - } - return te.Current.GetK8S(), currentLbs, nil + err := u.destroyCluster(ctx) + if err == nil { + if clusterDeletion { + return nil, nil, nil + } else { + currentLbs := te.Current.GetLoadBalancers().GetClusters() + for _, deleted := range te.Event.Task.DeleteState.GetLbs().GetClusters() { + currentLbs = slices.DeleteFunc(currentLbs, func(bcluster *spec.LBcluster) bool { + return deleted.ClusterInfo.Name == bcluster.ClusterInfo.Name + }) } + return te.Current.GetK8S(), currentLbs, nil } - log.Warn().Msgf("Failed destroying cluster task %q config %q cluster %q: %v", te.Event.Id, te.Config, te.Current.K8S.ClusterInfo.Name, err.Error()) } + + log.Warn().Msgf("Failed destroying cluster task %q config %q cluster %q: %v", te.Event.Id, te.Config, te.Current.K8S.ClusterInfo.Name, err.Error()) return te.Current.K8S, te.Current.GetLoadBalancers().GetClusters(), err } diff --git a/services/manager/cmd/api-server/main.go b/services/manager/cmd/api-server/main.go index f84e0a3cd..95cbae646 100644 --- a/services/manager/cmd/api-server/main.go +++ b/services/manager/cmd/api-server/main.go @@ -71,7 +71,7 @@ func run() error { errGroup.Go(func() error { worker.NewWorker( errGroupContext, - 10*time.Second, + service.Tick, func() error { return manager.WatchForPendingDocuments(errGroupContext) }, worker.ErrorLogger, ).Run() @@ -82,7 +82,7 @@ func run() error { errGroup.Go(func() error { worker.NewWorker( errGroupContext, - 10*time.Second, + service.Tick, func() error { return manager.WatchForScheduledDocuments(errGroupContext) }, worker.ErrorLogger, ).Run() @@ -93,7 +93,7 @@ func run() error { errGroup.Go(func() error { worker.NewWorker( errGroupContext, - 10*time.Second, + service.Tick, func() error { return manager.WatchForDoneOrErrorDocuments(errGroupContext) }, worker.ErrorLogger, ).Run() diff --git a/services/manager/internal/service/handler_update_nodepool.go b/services/manager/internal/service/handler_update_nodepool.go index 9cd2f9dd3..4210e02fb 100644 --- a/services/manager/internal/service/handler_update_nodepool.go +++ b/services/manager/internal/service/handler_update_nodepool.go @@ -59,8 +59,6 @@ func (g *GRPC) UpdateNodePool(ctx context.Context, request *pb.UpdateNodePoolReq return nil, status.Errorf(codes.FailedPrecondition, "can't update nodepool %q cluster %q from configuration on which changes are currently ongoing.", request.Cluster, request.Name) } - // We need initiate a build process due to the possible change - // of the nodepool nodes. grpc, err := store.ConvertToGRPC(dbConfig) if err != nil { return nil, status.Errorf(codes.Internal, "failed to convert database representation for config %q to grpc: %v", request.Name, err) @@ -88,21 +86,23 @@ func (g *GRPC) UpdateNodePool(ctx context.Context, request *pb.UpdateNodePoolReq return nil, status.Errorf(codes.FailedPrecondition, "can't move manifest from state %q to state %q", dbConfig.Manifest.State, manifest.Scheduled.String()) } + grpc.Manifest.State = spec.Manifest_Scheduled + ci := slices.IndexFunc(cnp, func(p *spec.NodePool) bool { return p.Name == request.Nodepool.Name }) di := slices.IndexFunc(dnp, func(p *spec.NodePool) bool { return p.Name == request.Nodepool.Name }) - diffResult := nodeDiff(cnp[ci], request.Nodepool) - - updateNodePool( - diffResult, + diffResult := nodeDiff( fmt.Sprintf("%s-%s", utils.GetClusterID(cluster.Current.K8S.ClusterInfo), request.Nodepool.Name), - dnp[di], + cnp[ci], + request.Nodepool, ) - grpc.Manifest.State = spec.Manifest_Scheduled + // prepare desired nodepool with new nodes. + dnp[di].GetDynamicNodePool().Count = int32(diffResult.newCount) + dnp[di].Nodes = append(append([]*spec.Node(nil), diffResult.reused...), diffResult.added...) cluster.Events = &spec.Events{ - Events: autoscaledEvents(diffResult, cluster.Desired), + Events: autoscaledEvents(diffResult, cluster.Current, cluster.Desired), Autoscaled: true, } @@ -116,6 +116,11 @@ func (g *GRPC) UpdateNodePool(ctx context.Context, request *pb.UpdateNodePoolReq return nil, status.Errorf(codes.Internal, "failed to convert config %q from grpc representation to database representation: %v", request.Name, err) } + // change the last applied checksum to a dummy value, + // so that the config will be rescheduled again to trigger + // the OnError handler if needed. + db.Manifest.LastAppliedChecksum = db.Manifest.LastAppliedChecksum[:len(db.Manifest.LastAppliedChecksum)-1] + if err := g.Store.UpdateConfig(ctx, db); err != nil { if errors.Is(err, store.ErrNotFoundOrDirty) { return nil, status.Errorf(codes.Aborted, "couldn't update config %q with version %v, dirty write", request.Name, request.Version) @@ -133,7 +138,8 @@ type nodeDiffResult struct { endpointDeleted bool } -func nodeDiff(current, desired *spec.NodePool) nodeDiffResult { +func nodeDiff(nodepoolId string, current, desired *spec.NodePool) nodeDiffResult { + usedNames := make(map[string]struct{}) result := nodeDiffResult{ nodepool: desired.Name, oldCount: int(current.GetDynamicNodePool().Count), @@ -141,66 +147,54 @@ func nodeDiff(current, desired *spec.NodePool) nodeDiffResult { } for _, n := range current.Nodes { - deleted := !slices.ContainsFunc(desired.Nodes, func(n2 *spec.Node) bool { return n2.Name == n.Name }) - if deleted { + canReuse := slices.ContainsFunc(desired.Nodes, func(n2 *spec.Node) bool { return n2.Name == n.Name }) + canReuse = canReuse && len(result.reused) < result.newCount + if canReuse { + log.Debug(). + Str("nodepool", nodepoolId). + Msgf("node %q resued to desired nodepool %q after autoscaler update", n.Name, desired.Name) + + result.reused = append(result.reused, n) + usedNames[n.Name] = struct{}{} + } else { + log.Debug(). + Str("nodepool", nodepoolId). + Msgf("node %q deleted from desired nodepool %q after autoscaler update", n.Name, desired.Name) + result.deleted = append(result.deleted, n) + usedNames[n.Name] = struct{}{} if n.NodeType == spec.NodeType_apiEndpoint { result.endpointDeleted = true } } } - for _, n := range current.Nodes { - reused := !slices.ContainsFunc(result.deleted, func(n2 *spec.Node) bool { return n2.Name == n.Name }) - if reused { - result.reused = append(result.reused, n) - } - } - for _, n := range desired.Nodes { - added := !slices.ContainsFunc(current.Nodes, func(n2 *spec.Node) bool { return n.Name == n2.Name }) - if added { + canAdd := !slices.ContainsFunc(current.Nodes, func(n2 *spec.Node) bool { return n.Name == n2.Name }) + canAdd = canAdd && (len(result.reused)+len(result.added) < result.newCount) + if canAdd { + log.Debug(). + Str("nodepool", nodepoolId). + Msgf("node %q added to desired nodepool %q after autoscaler update", n.Name, desired.Name) + result.added = append(result.added, n) + usedNames[n.Name] = struct{}{} } } - return result -} - -func updateNodePool(diff nodeDiffResult, nodePoolID string, desired *spec.NodePool) { - usedNames := make(map[string]struct{}) - var newNodes []*spec.Node - - for _, n := range diff.deleted { - log.Debug().Str("nodepool", nodePoolID).Msgf("node %q deleted from desired nodepool %q after autoscaler update", n.Name, desired.Name) - usedNames[n.Name] = struct{}{} - } - - for _, n := range diff.reused { - log.Debug().Str("nodepool", nodePoolID).Msgf("node %q resued to desired nodepool %q after autoscaler update", n.Name, desired.Name) - newNodes = append(newNodes, n) - usedNames[n.Name] = struct{}{} - } - - for _, n := range diff.added { - log.Debug().Str("nodepool", nodePoolID).Msgf("node %q added to desired nodepool %q after autoscaler update", n.Name, desired.Name) - newNodes = append(newNodes, n) - usedNames[n.Name] = struct{}{} - } - - for len(newNodes) < diff.newCount { - c := len(newNodes) - name := uniqueNodeName(nodePoolID, usedNames) + for range max(0, result.newCount-(len(result.reused)+len(result.added))) { + name := uniqueNodeName(nodepoolId, usedNames) usedNames[name] = struct{}{} - newNodes = append(newNodes, &spec.Node{Name: name}) - log.Debug().Str("nodepool", nodePoolID).Msgf("node %q added to desired nodepool %q after autoscaler update (%v < %v)", name, desired.Name, c, diff.newCount) + result.added = append(result.added, &spec.Node{Name: name}) + log.Debug(). + Str("nodepool", nodepoolId). + Msgf("node %q generated to desired nodepool %q after autoscaler update", name, desired.Name) } - desired.GetDynamicNodePool().Count = int32(diff.newCount) - desired.Nodes = newNodes + return result } -func autoscaledEvents(diff nodeDiffResult, desired *spec.Clusters) []*spec.TaskEvent { +func autoscaledEvents(diff nodeDiffResult, current, desired *spec.Clusters) []*spec.TaskEvent { var events []*spec.TaskEvent if diff.oldCount < diff.newCount || len(diff.added) > 0 { @@ -209,12 +203,55 @@ func autoscaledEvents(diff nodeDiffResult, desired *spec.Clusters) []*spec.TaskE Timestamp: timestamppb.New(time.Now().UTC()), Event: spec.Event_UPDATE, Description: "autoscaler: adding nodes to k8s cluster", - Task: &spec.Task{ - UpdateState: &spec.UpdateState{ - K8S: desired.K8S, // changes to the desired nodepool should have been done at this point. - Lbs: desired.GetLoadBalancers(), + Task: &spec.Task{UpdateState: &spec.UpdateState{ + K8S: desired.K8S, // changes to the desired nodepool should have been done at this point. + Lbs: desired.GetLoadBalancers(), + }}, + OnError: &spec.Retry{Do: &spec.Retry_Rollback_{ + Rollback: &spec.Retry_Rollback{ + Tasks: []*spec.TaskEvent{ + { + Id: uuid.New().String(), + Timestamp: timestamppb.New(time.Now().UTC()), + Event: spec.Event_DELETE, + Description: fmt.Sprintf("autoscaler rollback: deleting nodes from nodepool %s", diff.nodepool), + Task: &spec.Task{DeleteState: &spec.DeleteState{ + Nodepools: map[string]*spec.DeletedNodes{ + diff.nodepool: { + Nodes: func() []string { + var result []string + for _, n := range diff.added { + result = append(result, n.Name) + } + return result + }(), + }, + }, + }}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(25 * time.Minute / Tick), + }}}, + }, + { + Id: uuid.New().String(), + Timestamp: timestamppb.New(time.Now().UTC()), + Event: spec.Event_UPDATE, + Description: fmt.Sprintf("autoscaler rollback: deleting nodes from nodepool %s", diff.nodepool), + Task: &spec.Task{UpdateState: &spec.UpdateState{ + K8S: current.K8S, + Lbs: current.LoadBalancers, + }}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(25 * time.Minute / Tick), + }}}, + }, + }, }, - }, + }}, }) } @@ -231,7 +268,9 @@ func autoscaledEvents(diff nodeDiffResult, desired *spec.Clusters) []*spec.TaskE Node: node, }}, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) } @@ -246,6 +285,11 @@ func autoscaledEvents(diff nodeDiffResult, desired *spec.Clusters) []*spec.TaskE Event: spec.Event_DELETE, Description: "autoscaler: deleting nodes from k8s cluster", Task: &spec.Task{DeleteState: &spec.DeleteState{Nodepools: dn}}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(25 * time.Minute / Tick), + }}}, }) events = append(events, &spec.TaskEvent{ Id: uuid.New().String(), @@ -258,6 +302,11 @@ func autoscaledEvents(diff nodeDiffResult, desired *spec.Clusters) []*spec.TaskE Lbs: desired.GetLoadBalancers(), }, }, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(25 * time.Minute / Tick), + }}}, }) } diff --git a/services/manager/internal/service/handler_update_nodepool_test.go b/services/manager/internal/service/handler_update_nodepool_test.go index 9624c38e4..0c0637a48 100644 --- a/services/manager/internal/service/handler_update_nodepool_test.go +++ b/services/manager/internal/service/handler_update_nodepool_test.go @@ -17,6 +17,35 @@ func Test_nodeDiff(t *testing.T) { args args want nodeDiffResult }{ + { + name: "ok-reused--deleted-added", + args: args{ + current: &spec.NodePool{Name: "t0", Nodes: []*spec.Node{ + {Name: "0"}, {Name: "1"}, + {Name: "2"}, {Name: "3"}, + {Name: "4"}, {Name: "5"}, + }, Type: &spec.NodePool_DynamicNodePool{DynamicNodePool: &spec.DynamicNodePool{Count: 6}}}, + desired: &spec.NodePool{Name: "t0", Nodes: []*spec.Node{ + {Name: "0"}, + {Name: "3"}, + {Name: "4"}, {Name: "5"}, {Name: "6"}, + }, Type: &spec.NodePool_DynamicNodePool{DynamicNodePool: &spec.DynamicNodePool{Count: 6}}}, + }, + want: nodeDiffResult{ + nodepool: "t0", + deleted: []*spec.Node{{Name: "1"}, {Name: "2"}}, + reused: []*spec.Node{ + {Name: "0"}, {Name: "3"}, + {Name: "4"}, {Name: "5"}, + }, + added: []*spec.Node{ + {Name: "6"}, + {Name: "test-01"}, + }, + oldCount: 6, + newCount: 6, + }, + }, { name: "ok-reused-and-deleted", args: args{ @@ -38,7 +67,7 @@ func Test_nodeDiff(t *testing.T) { {Name: "0"}, {Name: "3"}, {Name: "4"}, {Name: "5"}, }, - added: []*spec.Node{{Name: "6"}}, + added: nil, oldCount: 6, newCount: 4, }, @@ -65,7 +94,7 @@ func Test_nodeDiff(t *testing.T) { {Name: "4"}, {Name: "5"}, }, endpointDeleted: true, - added: []*spec.Node{{Name: "6"}}, + added: nil, oldCount: 6, newCount: 4, }, @@ -73,7 +102,7 @@ func Test_nodeDiff(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - assert.Equalf(t, tt.want, nodeDiff(tt.args.current, tt.args.desired), "nodeDiff(%v, %v)", tt.args.current, tt.args.desired) + assert.Equalf(t, tt.want, nodeDiff("test", tt.args.current, tt.args.desired), "nodeDiff(%v, %v)", tt.args.current, tt.args.desired) }) } } diff --git a/services/manager/internal/service/rolling_update.go b/services/manager/internal/service/rolling_update.go index 594d154b6..0d73d2db2 100644 --- a/services/manager/internal/service/rolling_update.go +++ b/services/manager/internal/service/rolling_update.go @@ -114,8 +114,8 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas Lbs: current.LoadBalancers, // keep current lbs }, }, - OnError: &spec.RetryStrategy{ - Rollback: []*spec.TaskEvent{ + OnError: &spec.Retry{Do: &spec.Retry_Rollback_{Rollback: &spec.Retry_Rollback{ + Tasks: []*spec.TaskEvent{ { Id: uuid.New().String(), Timestamp: timestamppb.New(time.Now().UTC()), @@ -134,7 +134,9 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas }, }, }}, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, { Id: uuid.New().String(), @@ -147,18 +149,20 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas Lbs: current.LoadBalancers, // keep current lbs }, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, }, - }, + }}}, }) log.Debug(). Str("cluster", k8sID). Msgf("created event %q with Rollback on error [%q, %q] with repeat on rollback failure", events[len(events)-1].Description, - events[len(events)-1].OnError.Rollback[0].Description, - events[len(events)-1].OnError.Rollback[1].Description, + events[len(events)-1].OnError.Do.(*spec.Retry_Rollback_).Rollback.Tasks[0].Description, + events[len(events)-1].OnError.Do.(*spec.Retry_Rollback_).Rollback.Tasks[1].Description, ) // delete nodes from old nodepool. @@ -184,7 +188,9 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas Node: updated.Nodes[0].Name, }}, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) log.Debug(). @@ -202,7 +208,9 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas currentPool.Name: {Nodes: delNodes}, }, }}, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) log.Debug(). @@ -221,7 +229,9 @@ func rollingUpdate(current, desired *spec.Clusters) (*spec.Clusters, []*spec.Tas Lbs: current.LoadBalancers, // keep current lbs }, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) log.Debug(). diff --git a/services/manager/internal/service/rolling_update_lbs.go b/services/manager/internal/service/rolling_update_lbs.go index c7074d582..dc864e770 100644 --- a/services/manager/internal/service/rolling_update_lbs.go +++ b/services/manager/internal/service/rolling_update_lbs.go @@ -131,8 +131,8 @@ func rollingUpdateLB(current, desired *spec.Clusters, position int) (*spec.Clust Lbs: addNodePool, }, }, - OnError: &spec.RetryStrategy{ - Rollback: []*spec.TaskEvent{ + OnError: &spec.Retry{Do: &spec.Retry_Rollback_{Rollback: &spec.Retry_Rollback{ + Tasks: []*spec.TaskEvent{ { Id: uuid.New().String(), Timestamp: timestamppb.New(time.Now().UTC()), @@ -144,17 +144,19 @@ func rollingUpdateLB(current, desired *spec.Clusters, position int) (*spec.Clust Lbs: rollback, }, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, }, - }, + }}}, }) log.Debug(). Str("cluster", lbID). Msgf("created event %q with Rollback on error %q with repeat on rollback failure", events[len(events)-1].Description, - events[len(events)-1].OnError.Rollback[0].Description, + events[len(events)-1].OnError.Do.(*spec.Retry_Rollback_).Rollback.Tasks[0].Description, ) events = append(events, &spec.TaskEvent{ @@ -168,7 +170,9 @@ func rollingUpdateLB(current, desired *spec.Clusters, position int) (*spec.Clust Lbs: delNodePool, }, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) log.Debug(). diff --git a/services/manager/internal/service/schedule_tasks.go b/services/manager/internal/service/schedule_tasks.go index 8c4994d1f..9a7a17cff 100644 --- a/services/manager/internal/service/schedule_tasks.go +++ b/services/manager/internal/service/schedule_tasks.go @@ -9,7 +9,6 @@ import ( "github.com/berops/claudie/internal/utils" "github.com/berops/claudie/proto/pb/spec" - utils2 "github.com/berops/claudie/services/ansibler/server/utils" "github.com/berops/claudie/services/manager/internal/store" "github.com/google/uuid" "github.com/rs/zerolog/log" @@ -18,13 +17,35 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" ) -func scheduleTasks(scheduled *store.Config) (bool, error) { +// ScheduleResult describes what has happened during the +// scheduling of the tasks. +type ScheduleResult uint8 + +const ( + // NoReschedule describes the case where the manifest should not be rescheduled again + // after either error-ing or completing. + NoReschedule ScheduleResult = iota + // Reschedule describes the case where the manifest should be rescheduled again + // after either error-ing or completing. + Reschedule + // NotReady describes the case where the manifest is not ready to be scheduled yet, + // this is mostly related to the retry policies which can vary. For example if + // an exponential retry policy is used the manifest will not be ready to be scheduled + // until the specified number of Tick pass. + NotReady + // FinalRetry describes the case where a manifest had a retry policy to retry + // rescheduling the manifest N times before giving up. FinalRetry states that + // the manifest should be retried one last time before giving up. + FinalRetry +) + +func scheduleTasks(scheduled *store.Config) (ScheduleResult, error) { scheduledGRPC, err := store.ConvertToGRPC(scheduled) if err != nil { - return false, fmt.Errorf("failed to convert database representation to GRPC for %q: %w", scheduled.Name, err) + return NotReady, fmt.Errorf("failed to convert database representation to GRPC for %q: %w", scheduled.Name, err) } - var reschedule bool + var result ScheduleResult for cluster, state := range scheduledGRPC.Clusters { var events []*spec.TaskEvent @@ -62,22 +83,51 @@ func scheduleTasks(scheduled *store.Config) (bool, error) { // update default: if state.State.Status == spec.Workflow_ERROR { - if len(state.Events.Events) != 0 && state.Events.Events[0].OnError != nil { - reschedule = true - - switch e := state.Events.Events[0]; { - case e.OnError.Repeat: - events = state.Events.Events - log.Debug().Str("cluster", cluster).Msgf("rescheduled for a retry of previously failed task with ID %q.", e.Id) - case len(e.OnError.Rollback) > 0: - events = e.OnError.Rollback - log.Debug().Str("cluster", cluster).Msgf("rescheduled for a rollback with task ID %q of previous failed task with ID %q.", e.OnError.Rollback[0].Id, e.Id) + if tasks := state.Events.Events; len(tasks) != 0 && tasks[0].OnError.Do != nil { + task := tasks[0] + + switch s := task.OnError.Do.(type) { + case *spec.Retry_Repeat_: + events = tasks + + if s.Repeat.Kind == spec.Retry_Repeat_EXPONENTIAL { + if s.Repeat.RetryAfter > 0 { + s.Repeat.RetryAfter-- + result = NotReady + break + } + + s.Repeat.CurrentTick <<= 1 + if s.Repeat.CurrentTick >= s.Repeat.StopAfter { + // final retry before error-ing out. + result = FinalRetry + task.OnError.Do = nil + break + } + + s.Repeat.RetryAfter = s.Repeat.CurrentTick + } + + result = Reschedule + log.Debug(). + Str("cluster", cluster). + Msgf("rescheduled for a retry of previously failed task with ID %q.", task.Id) + case *spec.Retry_Rollback_: + result = Reschedule + events = s.Rollback.Tasks + + log.Debug(). + Str("cluster", cluster). + Msgf("rescheduled for a rollback with task ID %q of previous failed task with ID %q.", events[0].Id, task.Id) default: - log.Debug().Str("cluster", cluster).Msgf("has not been rescheduled for a retry on failure") - reschedule = false // no retry strategy on error. + result = NoReschedule + + log.Debug(). + Str("cluster", cluster). + Msgf("has not been rescheduled for a retry on failure") } - if reschedule { + if result == Reschedule || result == NotReady || result == FinalRetry { break } } @@ -85,19 +135,21 @@ func scheduleTasks(scheduled *store.Config) (bool, error) { ir, e, err := rollingUpdate(state.Current, state.Desired) if err != nil { - return false, err + return NotReady, err } events = append(events, e...) if len(events) != 0 { - log.Debug().Str("cluster", cluster).Msgf("[%d] rolling updates scheduled for k8s cluster, to be performed before building the actual desired state, starting with task with ID %q.", len(events), events[0].Id) + log.Debug(). + Str("cluster", cluster). + Msgf("[%d] rolling updates scheduled for k8s cluster, to be performed before building the actual desired state, starting with task with ID %q.", len(events), events[0].Id) // First we will let claudie to work on the rolling update // to have the latest versions of the terraform manifests. // After that the manifest will be rescheduled again // to handle the diff between the new current state (with // updated terraform files) and the desired state as specified // in the Manifest. - reschedule = true + result = Reschedule // We set the desired state to the intermediate desired state which is the same as the // current state but with updated templates for k8s cluster. After this state is build // by the builder the config will be rescheduled again to actually reflect the changes @@ -108,13 +160,15 @@ func scheduleTasks(scheduled *store.Config) (bool, error) { ir, e, err = rollingUpdateLBs(state.Current, state.Desired) if err != nil { - return false, err + return NotReady, err } events = append(events, e...) if len(events) > 0 { - log.Debug().Str("cluster", cluster).Msgf("[%d] rolling updates scheduled for attached lb clusters, to be performed before building the actual desired state, starting with task with ID %q.", len(events), events[0].Id) - reschedule = true + log.Debug(). + Str("cluster", cluster). + Msgf("[%d] rolling updates scheduled for attached lb clusters, to be performed before building the actual desired state, starting with task with ID %q.", len(events), events[0].Id) + result = Reschedule state.Desired = ir break } @@ -126,20 +180,28 @@ func scheduleTasks(scheduled *store.Config) (bool, error) { state.Desired.GetLoadBalancers().GetClusters(), )...) - log.Debug().Str("cluster", cluster).Msgf("Scheduled final [%d] tasks to be worked on to build the desired state", len(events)) + log.Debug(). + Str("cluster", cluster). + Msgf("Scheduled final [%d] tasks to be worked on to build the desired state", len(events)) + } + + switch result { + case Reschedule, NoReschedule, FinalRetry: + // Events are going to be worked on, thus clear the Error state, if any. + state.State = &spec.Workflow{Stage: spec.Workflow_NONE, Status: spec.Workflow_DONE} + case NotReady: } state.Events = &spec.Events{Events: events} - state.State = &spec.Workflow{Stage: spec.Workflow_NONE, Status: spec.Workflow_DONE} } db, err := store.ConvertFromGRPC(scheduledGRPC) if err != nil { - return false, fmt.Errorf("failed to convert GRPC representation to database for %q: %w", scheduled.Name, err) + return NotReady, fmt.Errorf("failed to convert GRPC representation to database for %q: %w", scheduled.Name, err) } *scheduled = *db - return reschedule, nil + return result, nil } // Diff takes the desired and current state to determine the difference and returns @@ -281,7 +343,9 @@ func Diff(current, desired *spec.K8Scluster, currentLbs, desiredLbs []*spec.LBcl Lbs: &spec.LoadBalancers{Clusters: irLbs}, }, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) } @@ -299,7 +363,9 @@ func Diff(current, desired *spec.K8Scluster, currentLbs, desiredLbs []*spec.LBcl Node: node, }}, }, - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }) } @@ -351,9 +417,6 @@ func Diff(current, desired *spec.K8Scluster, currentLbs, desiredLbs []*spec.LBcl return nil }(), }, - OnError: &spec.RetryStrategy{ - Repeat: ApiEndpointChanged(currentLbs, desiredLbs), - }, }) } @@ -808,26 +871,3 @@ func labelsTaintsAnnotationsDiff(current, desired *spec.K8Scluster) bool { } return false } - -func ApiEndpointChanged(current, desired []*spec.LBcluster) bool { - var lbs []*utils2.LBClusterData - - c := make(map[string]*spec.LBcluster) - for _, l := range current { - c[l.ClusterInfo.Name] = l - } - - for _, l := range desired { - lbs = append(lbs, &utils2.LBClusterData{ - CurrentLbCluster: c[l.ClusterInfo.Name], - DesiredLbCluster: l, - }) - } - - for _, l := range lbs { - if l.APIEndpointState() != utils2.NoChange { - return true - } - } - return false -} diff --git a/services/manager/internal/service/schedule_tasks_test.go b/services/manager/internal/service/schedule_tasks_test.go index 0f9581a95..f5dbe91eb 100644 --- a/services/manager/internal/service/schedule_tasks_test.go +++ b/services/manager/internal/service/schedule_tasks_test.go @@ -3,6 +3,7 @@ package service import ( "fmt" "testing" + "time" "github.com/berops/claudie/internal/utils" "github.com/berops/claudie/proto/pb/spec" @@ -41,7 +42,11 @@ var opts = cmpopts.IgnoreUnexported( spec.Task{}, spec.TaskEvent{}, timestamppb.Timestamp{}, - spec.RetryStrategy{}, + spec.Retry{}, + spec.Retry_Rollback_{}, + spec.Retry_Rollback{}, + spec.Retry_Repeat_{}, + spec.Retry_Repeat{}, ) func Test_findNewAPIEndpointCandidate(t *testing.T) { @@ -1075,7 +1080,9 @@ func Test_scheduleTasksRetry(t *testing.T) { Event: spec.Event_UPDATE, Task: &spec.Task{}, Description: "first task", - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, { Id: uuid.NewString(), @@ -1083,7 +1090,9 @@ func Test_scheduleTasksRetry(t *testing.T) { Event: spec.Event_UPDATE, Task: &spec.Task{}, Description: "second task", - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, }, Ttl: 510, @@ -1101,9 +1110,9 @@ func Test_scheduleTasksRetry(t *testing.T) { cfg, err := store.ConvertFromGRPC(repeat) assert.Nil(t, err) - reschedule, err := scheduleTasks(cfg) + result, err := scheduleTasks(cfg) assert.Nil(t, err) - assert.True(t, reschedule) + assert.Equal(t, Reschedule, result) got, err := store.ConvertToGRPC(cfg) assert.Nil(t, err) @@ -1128,6 +1137,210 @@ func Test_scheduleTasksRetry(t *testing.T) { diff := cmp.Diff(got, repeat, opts) t.Fatalf("schedule tasks (repeat) failed: %s", diff) } + + repeat = &spec.Config{ + Version: 0, + Name: "test", + K8SCtx: &spec.KubernetesContext{}, + Manifest: &spec.Manifest{}, + Clusters: map[string]*spec.ClusterState{ + "test-01": { + Current: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Desired: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Events: &spec.Events{ + Events: []*spec.TaskEvent{ + { + Id: uuid.NewString(), + Timestamp: timestamppb.Now(), + Event: spec.Event_UPDATE, + Task: &spec.Task{}, + Description: "first task", + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(20 * time.Second / Tick), + }}}, + }, + }, + Ttl: 510, + Autoscaled: false, + }, + State: &spec.Workflow{ + Stage: spec.Workflow_ANSIBLER, + Status: spec.Workflow_ERROR, + Description: "randomly failed", + }, + }, + }, + } + + cfg, err = store.ConvertFromGRPC(repeat) + assert.Nil(t, err) + + result, err = scheduleTasks(cfg) + assert.Nil(t, err) + assert.Equal(t, FinalRetry, result) + + got, err = store.ConvertToGRPC(cfg) + assert.Nil(t, err) + + assert.Equal(t, got.Clusters["test-01"].State.Stage, spec.Workflow_NONE) + assert.Equal(t, got.Clusters["test-01"].State.Status, spec.Workflow_DONE) + assert.Empty(t, got.Clusters["test-01"].State.Description) + assert.Empty(t, got.Clusters["test-01"].Events.Ttl) + assert.Empty(t, got.Clusters["test-01"].Events.Events[0].OnError.Do) + + repeat.Clusters["test-01"].State.Stage = spec.Workflow_NONE + repeat.Clusters["test-01"].State.Status = spec.Workflow_DONE + repeat.Clusters["test-01"].State.Description = "" + repeat.Clusters["test-01"].Events.Ttl = 0 + repeat.Clusters["test-01"].Events.Events[0].OnError.Do = nil + + for k := range repeat.Clusters { + for i := range repeat.Clusters[k].Events.Events { + repeat.Clusters[k].Events.Events[i].Timestamp = nil + got.Clusters[k].Events.Events[i].Timestamp = nil + } + } + if !proto.Equal(got, repeat) { + diff := cmp.Diff(got, repeat, opts) + t.Fatalf("schedule tasks (repeat) failed: %s", diff) + } + + repeat = &spec.Config{ + Version: 0, + Name: "test", + K8SCtx: &spec.KubernetesContext{}, + Manifest: &spec.Manifest{}, + Clusters: map[string]*spec.ClusterState{ + "test-01": { + Current: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Desired: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Events: &spec.Events{ + Events: []*spec.TaskEvent{ + { + Id: uuid.NewString(), + Timestamp: timestamppb.Now(), + Event: spec.Event_UPDATE, + Task: &spec.Task{}, + Description: "first task", + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(30 * time.Second / Tick), + }}}, + }, + }, + Ttl: 510, + Autoscaled: false, + }, + State: &spec.Workflow{ + Stage: spec.Workflow_ANSIBLER, + Status: spec.Workflow_ERROR, + Description: "randomly failed", + }, + }, + }, + } + + cfg, err = store.ConvertFromGRPC(repeat) + assert.Nil(t, err) + + result, err = scheduleTasks(cfg) + assert.Nil(t, err) + assert.Equal(t, Reschedule, result) + + got, err = store.ConvertToGRPC(cfg) + assert.Nil(t, err) + + assert.Equal(t, got.Clusters["test-01"].State.Stage, spec.Workflow_NONE) + assert.Equal(t, got.Clusters["test-01"].State.Status, spec.Workflow_DONE) + assert.Empty(t, got.Clusters["test-01"].State.Description) + assert.Empty(t, got.Clusters["test-01"].Events.Ttl) + + repeat.Clusters["test-01"].State.Stage = spec.Workflow_NONE + repeat.Clusters["test-01"].State.Status = spec.Workflow_DONE + repeat.Clusters["test-01"].State.Description = "" + repeat.Clusters["test-01"].Events.Ttl = 0 + repeat.Clusters["test-01"].Events.Events[0].OnError.Do.(*spec.Retry_Repeat_).Repeat.CurrentTick = 2 + repeat.Clusters["test-01"].Events.Events[0].OnError.Do.(*spec.Retry_Repeat_).Repeat.RetryAfter = 2 + + for k := range repeat.Clusters { + for i := range repeat.Clusters[k].Events.Events { + repeat.Clusters[k].Events.Events[i].Timestamp = nil + got.Clusters[k].Events.Events[i].Timestamp = nil + } + } + if !proto.Equal(got, repeat) { + diff := cmp.Diff(got, repeat, opts) + t.Fatalf("schedule tasks (repeat) failed: %s", diff) + } + + repeat = &spec.Config{ + Version: 0, + Name: "test", + K8SCtx: &spec.KubernetesContext{}, + Manifest: &spec.Manifest{}, + Clusters: map[string]*spec.ClusterState{ + "test-01": { + Current: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Desired: &spec.Clusters{K8S: &spec.K8Scluster{Kubeconfig: "config", ClusterInfo: &spec.ClusterInfo{Name: "test"}}}, + Events: &spec.Events{ + Events: []*spec.TaskEvent{ + { + Id: uuid.NewString(), + Timestamp: timestamppb.Now(), + Event: spec.Event_UPDATE, + Task: &spec.Task{}, + Description: "first task", + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_EXPONENTIAL, + CurrentTick: 1, + StopAfter: uint32(30 * time.Second / Tick), + RetryAfter: 2, + }}}, + }, + }, + Ttl: 510, + Autoscaled: false, + }, + State: &spec.Workflow{ + Stage: spec.Workflow_ANSIBLER, + Status: spec.Workflow_ERROR, + Description: "randomly failed", + }, + }, + }, + } + + cfg, err = store.ConvertFromGRPC(repeat) + assert.Nil(t, err) + + result, err = scheduleTasks(cfg) + assert.Nil(t, err) + assert.Equal(t, NotReady, result) + + got, err = store.ConvertToGRPC(cfg) + assert.Nil(t, err) + + assert.Equal(t, spec.Workflow_ANSIBLER, got.Clusters["test-01"].State.Stage) + assert.Equal(t, spec.Workflow_ERROR, got.Clusters["test-01"].State.Status) + assert.Equal(t, "randomly failed", got.Clusters["test-01"].State.Description) + assert.Equal(t, int32(0), got.Clusters["test-01"].Events.Ttl) + + repeat.Clusters["test-01"].Events.Events[0].OnError.Do.(*spec.Retry_Repeat_).Repeat.RetryAfter = 1 + repeat.Clusters["test-01"].Events.Ttl = 0 + + for k := range repeat.Clusters { + for i := range repeat.Clusters[k].Events.Events { + repeat.Clusters[k].Events.Events[i].Timestamp = nil + got.Clusters[k].Events.Events[i].Timestamp = nil + } + } + if !proto.Equal(got, repeat) { + diff := cmp.Diff(got, repeat, opts) + t.Fatalf("schedule tasks (repeat) failed: %s", diff) + } } func Test_scheduleTasksRollback(t *testing.T) { @@ -1139,7 +1352,9 @@ func Test_scheduleTasksRollback(t *testing.T) { Event: spec.Event_DELETE, Task: &spec.Task{}, Description: "mid task", - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, } rollback := &spec.Config{ @@ -1159,7 +1374,8 @@ func Test_scheduleTasksRollback(t *testing.T) { Event: spec.Event_UPDATE, Task: &spec.Task{}, Description: "first task", - OnError: &spec.RetryStrategy{Rollback: []*spec.TaskEvent{rb}}, + //OnError: &spec.RetryStrategy{Rollback: []*spec.TaskEvent{rb}}, + OnError: &spec.Retry{Do: &spec.Retry_Rollback_{Rollback: &spec.Retry_Rollback{Tasks: []*spec.TaskEvent{rb}}}}, }, { Id: uuid.NewString(), @@ -1167,7 +1383,9 @@ func Test_scheduleTasksRollback(t *testing.T) { Event: spec.Event_UPDATE, Task: &spec.Task{}, Description: "second task", - OnError: &spec.RetryStrategy{Repeat: true}, + OnError: &spec.Retry{Do: &spec.Retry_Repeat_{Repeat: &spec.Retry_Repeat{ + Kind: spec.Retry_Repeat_ENDLESS, + }}}, }, }, Ttl: 510, @@ -1185,9 +1403,9 @@ func Test_scheduleTasksRollback(t *testing.T) { cfg, err := store.ConvertFromGRPC(rollback) assert.Nil(t, err) - reschedule, err := scheduleTasks(cfg) + result, err := scheduleTasks(cfg) assert.Nil(t, err) - assert.True(t, reschedule) + assert.Equal(t, Reschedule, result) got, err := store.ConvertToGRPC(cfg) assert.Nil(t, err) diff --git a/services/manager/internal/service/watchers.go b/services/manager/internal/service/watchers.go index 51670a150..1453b4cae 100644 --- a/services/manager/internal/service/watchers.go +++ b/services/manager/internal/service/watchers.go @@ -5,6 +5,7 @@ import ( "context" "errors" "fmt" + "time" "github.com/berops/claudie/internal/manifest" "github.com/berops/claudie/internal/utils" @@ -12,9 +13,14 @@ import ( "github.com/berops/claudie/services/manager/internal/store" ) -// TaskTTL is the minimum number of ticks (every ~10sec) within which a given task must be completed -// before being rescheduled again. -const TaskTTL = 750 // ~2 hour +const ( + // TaskTTL is the minimum number of ticks (every ~10sec) within which a given task must be completed + // before being rescheduled again. + TaskTTL = 750 // ~2 hour + + // Tick represents the interval at which each manifest state is checked. + Tick = 10 * time.Second +) func (g *GRPC) WatchForScheduledDocuments(ctx context.Context) error { cfgs, err := g.Store.ListConfigs(ctx, &store.ListFilter{ManifestState: []string{manifest.Scheduled.String()}}) @@ -106,7 +112,7 @@ func (g *GRPC) WatchForPendingDocuments(ctx context.Context) error { continue } - reschedule, err := scheduleTasks(pending) + result, err := scheduleTasks(pending) if err != nil { logger.Err(err).Msgf("Failed to create tasks, skipping.") continue @@ -118,11 +124,16 @@ func (g *GRPC) WatchForPendingDocuments(ctx context.Context) error { continue } - pending.Manifest.State = manifest.Scheduled.String() - if !reschedule { - pending.Manifest.LastAppliedChecksum = pending.Manifest.Checksum - } else { + switch result { + case NotReady: + logger.Info().Msgf("manifest is not ready to be scheduled, retrying again later") + case Reschedule: + pending.Manifest.State = manifest.Scheduled.String() logger.Debug().Msgf("Scheduling for intermediate tasks after which the config will be rescheduled again") + case FinalRetry, NoReschedule: + logger.Debug().Msgf("Scheduling for tasks after which the config will not be rescheduled again") + pending.Manifest.State = manifest.Scheduled.String() + pending.Manifest.LastAppliedChecksum = pending.Manifest.Checksum } if err := g.Store.UpdateConfig(ctx, pending); err != nil { @@ -134,7 +145,12 @@ func (g *GRPC) WatchForPendingDocuments(ctx context.Context) error { continue } - logger.Info().Msgf("Config has been successfully processed and moved to the %q state", manifest.Scheduled.String()) + switch result { + case NotReady: + // do nothing. + case Reschedule, FinalRetry, NoReschedule: + logger.Info().Msgf("Config has been successfully processed and moved to the %q state", manifest.Scheduled.String()) + } } return nil diff --git a/services/manager/internal/store/convert_db_grpc.go b/services/manager/internal/store/convert_db_grpc.go index a9d7c689a..e21a99c9b 100644 --- a/services/manager/internal/store/convert_db_grpc.go +++ b/services/manager/internal/store/convert_db_grpc.go @@ -63,7 +63,7 @@ func ConvertToGRPCTaskEvent(te TaskEvent) (*spec.TaskEvent, error) { return nil, err } - var strategy spec.RetryStrategy + var strategy spec.Retry if err := proto.Unmarshal(te.OnError, &strategy); err != nil { return nil, err } diff --git a/services/manager/internal/store/convert_db_grpc_test.go b/services/manager/internal/store/convert_db_grpc_test.go index 2d4e41044..258a92906 100644 --- a/services/manager/internal/store/convert_db_grpc_test.go +++ b/services/manager/internal/store/convert_db_grpc_test.go @@ -35,7 +35,7 @@ var opts = cmpopts.IgnoreUnexported( spec.Provider_Hetzner{}, spec.HetznerProvider{}, spec.TemplateRepository{}, - spec.RetryStrategy{}, + spec.Retry{}, ) func TestConvertToGRPCAndBack(t *testing.T) { diff --git a/services/terraformer/server/domain/usecases/build_infrastructure.go b/services/terraformer/server/domain/usecases/build_infrastructure.go index 2840a5a2c..277013ce5 100644 --- a/services/terraformer/server/domain/usecases/build_infrastructure.go +++ b/services/terraformer/server/domain/usecases/build_infrastructure.go @@ -24,6 +24,7 @@ func (u *Usecases) BuildInfrastructure(request *pb.BuildInfrastructureRequest) ( k8slogger := utils.CreateLoggerWithProjectAndClusterName(request.ProjectName, k8sCluster.Id()) k8slogger.Info().Msg("Creating infrastructure") if err := k8sCluster.Build(k8slogger); err != nil { + k8slogger.Err(err).Msgf("failed tu build k8s cluster") return &pb.BuildInfrastructureResponse{ Response: &pb.BuildInfrastructureResponse_Fail{ Fail: &pb.BuildInfrastructureResponse_InfrastructureData{ diff --git a/services/terraformer/server/domain/utils/templates/providers.tpl b/services/terraformer/server/domain/utils/templates/providers.tpl index 28dfa16f0..0b6f5df1f 100644 --- a/services/terraformer/server/domain/utils/templates/providers.tpl +++ b/services/terraformer/server/domain/utils/templates/providers.tpl @@ -45,7 +45,7 @@ terraform { {{- if .GenesisCloud }} genesiscloud = { source = "genesiscloud/genesiscloud" - version = "1.0.0" + version = "1.1.10" } {{- end }} } diff --git a/services/testing-framework/utils.go b/services/testing-framework/utils.go index 0eec1b975..d02500a19 100644 --- a/services/testing-framework/utils.go +++ b/services/testing-framework/utils.go @@ -44,7 +44,11 @@ var ( spec.Role{}, spec.Events{}, spec.TaskEvent{}, - spec.RetryStrategy{}, + spec.Retry{}, + spec.Retry_Rollback_{}, + spec.Retry_Rollback{}, + spec.Retry_Repeat_{}, + spec.Retry_Repeat{}, spec.Task{}, spec.CreateState{}, spec.UpdateState{},