Skip to content

Commit a8e1249

Browse files
authored
update-refs (#101)
* Updated radix-operator version * Cleanup
1 parent f0cc40c commit a8e1249

14 files changed

+485
-40
lines changed

.github/workflows/cd.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ permissions:
1212
jobs:
1313

1414
build:
15-
1615
runs-on: ubuntu-latest
17-
16+
strategy:
17+
matrix:
18+
arch: [ arm64 ]
1819
steps:
1920
- name: Checkout
2021
uses: actions/checkout@v4
@@ -32,7 +33,7 @@ jobs:
3233
password: ${{ secrets.GITHUB_TOKEN }}
3334

3435
- name: Set up Go
35-
uses: actions/setup-go@v4
36+
uses: actions/setup-go@v5
3637
with:
3738
go-version: '1.21'
3839

.github/workflows/ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ permissions:
1111
jobs:
1212

1313
build:
14-
1514
runs-on: ubuntu-latest
16-
15+
strategy:
16+
matrix:
17+
arch: [ arm64 ]
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@v4
@@ -40,6 +41,9 @@ jobs:
4041
lint:
4142
name: Lint
4243
runs-on: ubuntu-latest
44+
strategy:
45+
matrix:
46+
arch: [ arm64 ]
4347
steps:
4448
- uses: actions/checkout@v4
4549
with:

cmd/logsEnvironment.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ import (
1919

2020
apiclient "github.com/equinor/radix-cli/generated-client/client"
2121
"github.com/equinor/radix-cli/generated-client/client/environment"
22+
"github.com/equinor/radix-cli/generated-client/models"
2223
"github.com/equinor/radix-cli/pkg/client"
2324
"github.com/equinor/radix-cli/pkg/flagnames"
2425
"github.com/equinor/radix-cli/pkg/settings"
26+
"github.com/equinor/radix-common/utils/slice"
2527
"github.com/spf13/cobra"
2628
)
2729

@@ -87,7 +89,9 @@ func getComponentReplicasForEnvironment(apiClient *apiclient.Radixapi, appName,
8789
componentReplicas := make(map[string][]string)
8890
for _, component := range environmentDetails.Payload.ActiveDeployment.Components {
8991
if component.Name != nil {
90-
componentReplicas[*component.Name] = component.Replicas
92+
componentReplicas[*component.Name] = slice.Reduce(component.ReplicaList, make([]string, 0), func(acc []string, replica *models.ReplicaSummary) []string {
93+
return append(acc, *replica.Name)
94+
})
9195
}
9296
}
9397

cmd/logsEnvironmentComponent.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ import (
2323
apiclient "github.com/equinor/radix-cli/generated-client/client"
2424
"github.com/equinor/radix-cli/generated-client/client/component"
2525
"github.com/equinor/radix-cli/generated-client/client/environment"
26+
"github.com/equinor/radix-cli/generated-client/models"
2627
"github.com/equinor/radix-cli/pkg/client"
2728
"github.com/equinor/radix-cli/pkg/flagnames"
2829
"github.com/equinor/radix-cli/pkg/settings"
2930
"github.com/equinor/radix-cli/pkg/utils/log"
31+
"github.com/equinor/radix-common/utils/slice"
3032
"github.com/go-openapi/strfmt"
3133
"github.com/spf13/cobra"
3234
)
@@ -161,7 +163,9 @@ func getReplicasForComponent(apiClient *apiclient.Radixapi, appName, environment
161163
for _, comp := range environmentDetails.Payload.ActiveDeployment.Components {
162164
if comp.Name != nil &&
163165
*comp.Name == componentName {
164-
replicas = comp.Replicas
166+
replicas = slice.Reduce(comp.ReplicaList, make([]string, 0), func(acc []string, replica *models.ReplicaSummary) []string {
167+
return append(acc, *replica.Name)
168+
})
165169
break
166170
}
167171
}

generated-client/models/component.go

+52-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated-client/models/component_summary.go

+51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)