Skip to content

Commit fd8cda4

Browse files
emosbaughemosbaugh
authored
chore(ci): proxy acl whitelist (#1864)
1 parent 92c509f commit fd8cda4

File tree

29 files changed

+299
-77
lines changed

29 files changed

+299
-77
lines changed

‎cmd/buildtools/adminconsole.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var updateAdminConsoleAddonCommand = &cli.Command{
7171

7272
logrus.Infof("extracting images from chart")
7373
withproto := fmt.Sprintf("oci://%s", upstream)
74-
images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "adminconsole", latest, values)
74+
images, err := helm.ExtractImagesFromChart(hcli, withproto, latest, values)
7575
if err != nil {
7676
return fmt.Errorf("failed to get images from admin console chart: %w", err)
7777
}

‎cmd/buildtools/embeddedclusteroperator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func updateOperatorAddonImages(ctx context.Context, hcli helm.Client, chartURL s
125125
}
126126

127127
logrus.Infof("extracting images from chart version %s", chartVersion)
128-
images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "embeddedclusteroperator", chartVersion, values)
128+
images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
129129
if err != nil {
130130
return fmt.Errorf("failed to get images from embedded cluster operator chart: %w", err)
131131
}

‎cmd/buildtools/metadata.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"log"
77
"os"
88
"sort"
9-
"strings"
109

1110
k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
1211
embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
@@ -125,9 +124,5 @@ func extractImagesFromChart(hcli helm.Client, chart embeddedclusterv1beta1.Chart
125124
}
126125
}
127126

128-
if strings.HasPrefix(chart.ChartName, "oci://") {
129-
return helm.ExtractImagesFromOCIChart(hcli, chart.ChartName, chart.Name, chart.Version, values)
130-
}
131-
parts := strings.SplitN(chart.ChartName, "/", 2)
132-
return helm.ExtractImagesFromChart(hcli, parts[0], parts[1], chart.Version, values)
127+
return helm.ExtractImagesFromChart(hcli, chart.ChartName, chart.Version, values)
133128
}

‎cmd/buildtools/openebs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func updateOpenEBSAddonImages(ctx context.Context, hcli helm.Client, chartURL st
134134
}
135135

136136
logrus.Infof("extracting images from chart version %s", chartVersion)
137-
images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "openebs", chartVersion, values)
137+
images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
138138
if err != nil {
139139
return fmt.Errorf("failed to get images from openebs chart: %w", err)
140140
}

‎cmd/buildtools/registry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var updateRegistryAddonCommand = &cli.Command{
7272

7373
logrus.Infof("extracting images from chart")
7474
withproto := fmt.Sprintf("oci://%s", upstream)
75-
images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "docker-registry", latest, values)
75+
images, err := helm.ExtractImagesFromChart(hcli, withproto, latest, values)
7676
if err != nil {
7777
return fmt.Errorf("failed to get images from chart: %w", err)
7878
}

‎cmd/buildtools/seaweedfs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func updateSeaweedFSAddonImages(ctx context.Context, hcli helm.Client, chartURL
122122
}
123123

124124
logrus.Infof("extracting images from chart version %s", chartVersion)
125-
images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "seaweedfs", chartVersion, values)
125+
images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
126126
if err != nil {
127127
return fmt.Errorf("failed to get images from seaweedfs chart: %w", err)
128128
}

‎cmd/buildtools/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func MirrorChart(hcli helm.Client, repo *repo.Entry, name, ver string) error {
452452
dst := fmt.Sprintf("oci://%s", os.Getenv("CHARTS_DESTINATION"))
453453
chartURL := fmt.Sprintf("%s/%s", dst, name)
454454
logrus.Infof("verifying if destination tag already exists")
455-
dstMeta, err := helm.GetOCIChartMetadata(hcli, chartURL, name, ver)
455+
dstMeta, err := helm.GetChartMetadata(hcli, chartURL, ver)
456456
if err != nil && !strings.HasSuffix(err.Error(), "not found") {
457457
return fmt.Errorf("verify tag exists: %w", err)
458458
} else if err == nil {

‎cmd/buildtools/velero.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func findVeleroVersionFromChart(ctx context.Context, hcli helm.Client, chartURL
171171
if err != nil {
172172
return "", fmt.Errorf("failed to get velero values: %v", err)
173173
}
174-
images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "velero", chartVersion, values)
174+
images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
175175
if err != nil {
176176
return "", fmt.Errorf("failed to get images from velero chart: %w", err)
177177
}
@@ -216,7 +216,7 @@ func updateVeleroAddonImages(ctx context.Context, hcli helm.Client, chartURL str
216216
}
217217

218218
logrus.Infof("extracting images from chart version %s", chartVersion)
219-
images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "velero", chartVersion, values)
219+
images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
220220
if err != nil {
221221
return fmt.Errorf("failed to get images from velero chart: %w", err)
222222
}

‎cmd/installer/kotscli/kotscli.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package kotscli
22

33
import (
4+
"bytes"
45
"fmt"
6+
"io"
57
"os"
68
"regexp"
79
"strings"
@@ -12,6 +14,7 @@ import (
1214
"github.com/replicatedhq/embedded-cluster/pkg/release"
1315
"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
1416
"github.com/replicatedhq/embedded-cluster/pkg/spinner"
17+
"github.com/sirupsen/logrus"
1518
)
1619

1720
var (
@@ -75,13 +78,22 @@ func Install(opts InstallOptions, msg *spinner.MessageWriter) error {
7578
defer msg.SetMask(nil)
7679
defer msg.SetLineBreaker(nil)
7780

81+
stdout := bytes.NewBuffer(nil)
82+
stderr := bytes.NewBuffer(nil)
83+
7884
runCommandOptions := helpers.RunCommandOptions{
79-
Stdout: msg,
85+
Stdout: io.MultiWriter(msg, stdout),
86+
Stderr: stderr,
8087
Env: map[string]string{
8188
"EMBEDDED_CLUSTER_ID": metrics.ClusterID().String(),
8289
},
8390
}
84-
if err := helpers.RunCommandWithOptions(runCommandOptions, kotsBinPath, installArgs...); err != nil {
91+
err = helpers.RunCommandWithOptions(runCommandOptions, kotsBinPath, installArgs...)
92+
logrus.Debugf("kotscli stdout: %s", stdout.String())
93+
if out := strings.TrimSpace(stderr.String()); out != "" {
94+
logrus.Debugf("kotscli stderr: %s", out)
95+
}
96+
if err != nil {
8597
return fmt.Errorf("unable to install the application: %w", err)
8698
}
8799

‎e2e/kots-release-install-failing-preflights/cluster-config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,23 @@ spec:
5050
namespace: ingress-nginx
5151
version: "4.11.3"
5252
values: |
53+
global:
54+
image:
55+
registry: proxy.replicated.com/anonymous/registry.k8s.io
5356
controller:
5457
service:
5558
type: NodePort
5659
nodePorts:
5760
http: "80"
5861
https: "443"
5962
image:
63+
registry: proxy.replicated.com/anonymous/registry.k8s.io
6064
digest: ""
6165
digestChroot: ""
6266
admissionWebhooks:
6367
patch:
6468
image:
69+
registry: proxy.replicated.com/anonymous/registry.k8s.io
6570
digest: ""
6671
- chartname: okgolove/goldpinger
6772
name: goldpinger

0 commit comments

Comments
 (0)