-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include v1beta2 Helm charts images to known images in air gapped mode (…
…#4458) * Include v1beta2 Helm charts images to known images in air gapped mode
- Loading branch information
Showing
81 changed files
with
1,830 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
Name: test airgap | ||
PullOptions: | ||
Namespace: app-namespace | ||
ExcludeAdminConsole: true | ||
IsAirgap: true | ||
Silent: true | ||
LocalPath: cases/airgap/upstream | ||
RootDir: cases/airgap/results | ||
SharedPassword: dummy-pass | ||
RewriteImages: true | ||
RewriteImageOptions: | ||
Hostname: ttl.sh | ||
Namespace: test | ||
Username: test | ||
Password: fake-pass | ||
IsReadOnly: true | ||
Downstreams: | ||
- this-cluster |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
apiVersion: kots.io/v1beta1 | ||
kind: Application | ||
metadata: | ||
name: my-app | ||
annotations: | ||
kots.io/exclude: "true" | ||
spec: | ||
title: my-app |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
apiVersion: kots.io/v1beta1 | ||
kind: HelmChart | ||
metadata: | ||
name: my-chart | ||
spec: | ||
# chart identifies a matching chart from a .tgz | ||
chart: | ||
name: my-chart | ||
chartVersion: 0.1.0 | ||
releaseName: my-chart-release | ||
useHelmInstall: true | ||
|
||
# values are used in the customer environment, as a pre-render step | ||
# these values will be supplied to helm template | ||
values: {} | ||
|
||
# builder values provide a way to render the chart with all images | ||
# and manifests. this is used in replicated to create airgap packages | ||
builder: {} |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
apiVersion: kots.io/v1beta2 | ||
kind: HelmChart | ||
metadata: | ||
name: replicated | ||
annotations: | ||
kots.io/exclude: "true" | ||
spec: | ||
chart: | ||
name: replicated | ||
chartVersion: 1.0.0-beta.12 | ||
releaseName: replicated-release | ||
values: | ||
my-value: my-value | ||
optionalValues: | ||
- when: 'repl{{ "true" }}' | ||
recursiveMerge: true | ||
values: | ||
my-optional-value: my-optional-value |
25 changes: 25 additions & 0 deletions
25
pkg/tests/pull/cases/airgap/upstream/subdir/configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: test-licenseinfo | ||
data: | ||
dockerCfg: {{repl LicenseDockerCfg }} | ||
licenseFieldValueIsGitOpsSupported: {{repl LicenseFieldValue "isGitOpsSupported" }} | ||
licenseFieldValueIsIdentityServiceSupported: {{repl LicenseFieldValue "isIdentityServiceSupported" }} | ||
licenseFieldValueIsGeoaxisSupported: {{repl LicenseFieldValue "isGeoaxisSupported" }} | ||
licenseFieldValueIsAirgapSupported: {{repl LicenseFieldValue "isAirgapSupported" }} | ||
licenseFieldValueLicenseType: {{repl LicenseFieldValue "licenseType" }} | ||
licenseFieldValueLicenseSequence: {{repl LicenseFieldValue "licenseSequence" }} | ||
licenseFieldValueSignature: '{{repl LicenseFieldValue "signature" }}' | ||
licenseFieldValueAppSlug: {{repl LicenseFieldValue "appSlug" }} | ||
licenseFieldValueChannelID: {{repl LicenseFieldValue "channelID" }} | ||
licenseFieldValueChannelName: {{repl LicenseFieldValue "channelName" }} | ||
licenseFieldValueCustomerName: {{repl LicenseFieldValue "customerName" }} | ||
licenseFieldValueEndpoint: {{repl LicenseFieldValue "endpoint" }} | ||
licenseFieldValueLicenseID: {{repl LicenseFieldValue "licenseID" }} | ||
licenseFieldValueLicenseId: {{repl LicenseFieldValue "licenseId" }} | ||
licenseFieldValueCustomIntField: {{repl LicenseFieldValue "int_field" }} | ||
licenseFieldValueCustomStringField: {{repl LicenseFieldValue "string_field" }} | ||
licenseFieldValueCustomTextField: "{{repl LicenseFieldValue "text_field" | replace "\n" "\\n" }}" | ||
licenseFieldValueCustomBoolField: "{{repl LicenseFieldValue "bool_field" }}" | ||
licenseFieldValueCustomHiddenField: "{{repl LicenseFieldValue "hidden_field" }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: nginx | ||
--- | ||
kind: Service | ||
apiVersion: v1 | ||
metadata: | ||
name: nginx | ||
labels: | ||
app: nginx | ||
spec: | ||
ports: | ||
- port: 80 | ||
name: web | ||
--- | ||
kind: Deployment | ||
apiVersion: apps/v1 | ||
metadata: | ||
name: nginx | ||
spec: | ||
selector: | ||
matchLabels: | ||
app: nginx | ||
replicas: 1 | ||
template: | ||
metadata: | ||
labels: | ||
app: nginx | ||
spec: | ||
serviceAccountName: nginx | ||
containers: | ||
- name: nginx | ||
image: nginx:1.24 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
apiVersion: kots.io/v1beta1 | ||
kind: HelmChart | ||
metadata: | ||
name: test-chart | ||
spec: | ||
# chart identifies a matching chart from a .tgz | ||
chart: | ||
name: test-chart | ||
chartVersion: 0.1.0 | ||
useHelmInstall: false | ||
namespace: helmns | ||
|
||
# values are used in the customer environment, as a pre-render step | ||
# these values will be supplied to helm template | ||
values: {} | ||
|
||
# builder values provide a way to render the chart with all images | ||
# and manifests. this is used in replicated to create airgap packages | ||
builder: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
apiVersion: kots.io/v1beta1 | ||
kind: ConfigValues | ||
metadata: | ||
creationTimestamp: null | ||
name: my-app | ||
spec: | ||
values: | ||
hostname: | ||
value: "my-app.somebigbank.com" | ||
status: {} |
47 changes: 47 additions & 0 deletions
47
pkg/tests/pull/cases/airgap/upstream/userdata/license.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
apiVersion: kots.io/v1beta1 | ||
kind: License | ||
metadata: | ||
name: testcustomer | ||
spec: | ||
appSlug: my-app | ||
channelID: 1vusIYZLAVxMG6q760OJmRKj5i5 | ||
channelName: My Channel | ||
customerName: Test Customer | ||
endpoint: https://replicated.app | ||
entitlements: | ||
bool_field: | ||
title: Bool Field | ||
value: true | ||
valueType: Boolean | ||
expires_at: | ||
description: License Expiration | ||
title: Expiration | ||
value: "2030-07-27T00:00:00Z" | ||
valueType: String | ||
hidden_field: | ||
isHidden: true | ||
title: Hidden Field | ||
value: this is secret | ||
valueType: String | ||
int_field: | ||
title: Int Field | ||
value: 123 | ||
valueType: Integer | ||
string_field: | ||
title: StringField | ||
value: single line text | ||
valueType: String | ||
text_field: | ||
title: Text Field | ||
value: |- | ||
multi | ||
line | ||
text | ||
valueType: Text | ||
isAirgapSupported: true | ||
isGitOpsSupported: true | ||
isSnapshotSupported: true | ||
licenseID: 1vusOokxAVp1tkRGuyxnF23PJcq | ||
licenseSequence: 7 | ||
licenseType: prod | ||
signature: eyJsaWNlbnNlRGF0YSI6ImV5SmhjR2xXWlhKemFXOXVJam9pYTI5MGN5NXBieTkyTVdKbGRHRXhJaXdpYTJsdVpDSTZJa3hwWTJWdWMyVWlMQ0p0WlhSaFpHRjBZU0k2ZXlKdVlXMWxJam9pZEdWemRHTjFjM1J2YldWeUluMHNJbk53WldNaU9uc2liR2xqWlc1elpVbEVJam9pTVhaMWMwOXZhM2hCVm5BeGRHdFNSM1Y1ZUc1R01qTlFTbU54SWl3aWJHbGpaVzV6WlZSNWNHVWlPaUp3Y205a0lpd2lZM1Z6ZEc5dFpYSk9ZVzFsSWpvaVZHVnpkQ0JEZFhOMGIyMWxjaUlzSW1Gd2NGTnNkV2NpT2lKdGVTMWhjSEFpTENKamFHRnVibVZzU1VRaU9pSXhkblZ6U1ZsYVRFRldlRTFITm5FM05qQlBTbTFTUzJvMWFUVWlMQ0pqYUdGdWJtVnNUbUZ0WlNJNklrMTVJRU5vWVc1dVpXd2lMQ0pzYVdObGJuTmxVMlZ4ZFdWdVkyVWlPamNzSW1WdVpIQnZhVzUwSWpvaWFIUjBjSE02THk5eVpYQnNhV05oZEdWa0xtRndjQ0lzSW1WdWRHbDBiR1Z0Wlc1MGN5STZleUppYjI5c1gyWnBaV3hrSWpwN0luUnBkR3hsSWpvaVFtOXZiQ0JHYVdWc1pDSXNJblpoYkhWbElqcDBjblZsTENKMllXeDFaVlI1Y0dVaU9pSkNiMjlzWldGdUluMHNJbVY0Y0dseVpYTmZZWFFpT25zaWRHbDBiR1VpT2lKRmVIQnBjbUYwYVc5dUlpd2laR1Z6WTNKcGNIUnBiMjRpT2lKTWFXTmxibk5sSUVWNGNHbHlZWFJwYjI0aUxDSjJZV3gxWlNJNklqSXdNekF0TURjdE1qZFVNREE2TURBNk1EQmFJaXdpZG1Gc2RXVlVlWEJsSWpvaVUzUnlhVzVuSW4wc0ltaHBaR1JsYmw5bWFXVnNaQ0k2ZXlKMGFYUnNaU0k2SWtocFpHUmxiaUJHYVdWc1pDSXNJblpoYkhWbElqb2lkR2hwY3lCcGN5QnpaV055WlhRaUxDSjJZV3gxWlZSNWNHVWlPaUpUZEhKcGJtY2lMQ0pwYzBocFpHUmxiaUk2ZEhKMVpYMHNJbWx1ZEY5bWFXVnNaQ0k2ZXlKMGFYUnNaU0k2SWtsdWRDQkdhV1ZzWkNJc0luWmhiSFZsSWpveE1qTXNJblpoYkhWbFZIbHdaU0k2SWtsdWRHVm5aWElpZlN3aWMzUnlhVzVuWDJacFpXeGtJanA3SW5ScGRHeGxJam9pVTNSeWFXNW5SbWxsYkdRaUxDSjJZV3gxWlNJNkluTnBibWRzWlNCc2FXNWxJSFJsZUhRaUxDSjJZV3gxWlZSNWNHVWlPaUpUZEhKcGJtY2lmU3dpZEdWNGRGOW1hV1ZzWkNJNmV5SjBhWFJzWlNJNklsUmxlSFFnUm1sbGJHUWlMQ0oyWVd4MVpTSTZJbTExYkhScFhHNXNhVzVsWEc1MFpYaDBJaXdpZG1Gc2RXVlVlWEJsSWpvaVZHVjRkQ0o5ZlN3aWFYTkJhWEpuWVhCVGRYQndiM0owWldRaU9uUnlkV1VzSW1selIybDBUM0J6VTNWd2NHOXlkR1ZrSWpwMGNuVmxMQ0pwYzFOdVlYQnphRzkwVTNWd2NHOXlkR1ZrSWpwMGNuVmxmWDA9IiwiaW5uZXJTaWduYXR1cmUiOiJleUpzYVdObGJuTmxVMmxuYm1GMGRYSmxJam9pYUhneE1XTXZUR1ozUTNoVE5YRmtRWEJGU1hGdVRrMU9NMHBLYTJzNFZHZFhSVVpzVDFKVlJ6UjJjR1YzZEZoV1YzbG1lamRZY0hBd1ExazJZamRyUVRSS2N6TklhR3d3YkZJMFdUQTFMemN2UVVkQ2FEZFZNSGczUkhaTVozUXpVM00wYm5GTFZTdFhXRXBTVHpKWVFVRnZSME4xZFRWR1RGcHJRVWhYY1RSUVFtMXphSFY2Y1ZsdmNucHhlbGhGWVZWVlpFUlVkVXhDTW1nNWFIZ3dXRWhQUmxwUk16bHVkbTlPUjJaT2R5OTRTVmRaZEhSUGRYZHZhMncyTVZsb1JVeFZlRmQxU1ZSRmMwTlVhM2xtTVRNd09IazVSbFJzWlRKeVYyZEVlSEZNYTBSUFNXVXlPRWwzUzJSQkwySXdWVUl5VEZGbVRWcHdWemwyUTNCSkwybHlWek5uYmpaeU5WWjNWMjB2U1dweWJtNDNSelJrVmpadVYzcFRkMGhQUTJSdWEwMTRNRXQ1VVVOa0wxQjFaWEpUYjNSdVEwOXRTMDEzWlRSTGJqaERkMU5YVVRRNGRURkRNbTFpV1VzeGRYTlpOM1YzUFQwaUxDSndkV0pzYVdOTFpYa2lPaUl0TFMwdExVSkZSMGxPSUZCVlFreEpReUJMUlZrdExTMHRMVnh1VFVsSlFrbHFRVTVDWjJ0eGFHdHBSemwzTUVKQlVVVkdRVUZQUTBGUk9FRk5TVWxDUTJkTFEwRlJSVUZ6TkhKdlVIcDFhV1JNZVhOMmIxWTJkemxhTkZ4dVdHRmliME5tWTJNeGFHZFZhQ3N3V1VkS2NFNURSVXhyTjBaTFF5OTJhemR6ZERsR05tY3dUMjlrU0VSbGVYZFJXa2hLZFU1TVpsUnNRbEJHUTJOaU5seHVObTlzVEZOeWNGQTRjbFUzU0d4SGJsRkVSMFJNYVhkS1EyaGtSRGRVVUdSM2FXdHBkMHRGY201aldqaEdaalZsU25vd2RETmlUWFpyVDJaVVluSkJiRnh1WWtGQ1kwbzVNVmxVT1hKdVVXOXFkVWN4UldKUVRqaEZWblI2TWxZNE5IZHViR2Q0TUhCd2JEVjRPSFpOYlhwcE1ISnVibEZVV1VGamJ6WnFhMnBJTTF4dVRuTlVkWE4xUzFkdlJGUjVNWE5yZGtSUk9IbEJZV0ptWTNNME4zWnNRazAwU0RGT1JFNHZSSFJhWWxZdllubDJia0o2YkM4eFZrVnpURmRqWlZWcFRGeHVSWEYxT0VkeWF5dFFVRGQyUkdSd2JFUjNjWFpQV2t4RmRYazNkamhuUm01U09WUlVSV3ByTlVvNWRuWlVTR2RtU25VemVubEVPR2xLWTBSRE5YcHFPVnh1YjFGSlJFRlJRVUpjYmkwdExTMHRSVTVFSUZCVlFreEpReUJMUlZrdExTMHRMVnh1SWl3aWEyVjVVMmxuYm1GMGRYSmxJam9pWlhsS2VtRlhaSFZaV0ZJeFkyMVZhVTlwU2pCUldIQjJXVE5LVms1NmFGaFNSMlJzVVRKb2NtTklXa1ZVVlRsRldqQktXVTFGUmtaVFJFNUZVMGhLYkUxclRUTkxNSEJFVkROR2VGTnROVVJVVlRWVlltMDFiVnBGUm5sWldIQjZaRVJqTVZaSGFFeFBXRUpVVWtacmRrd3diek5aTUZaSlVteFdWRXd5T1VoV1JXeHNWa1ZPTUZSSE1WWlJNR04zVkd4R2JGa3pTblJUUm1zMFZVWk9hMVpWU2pCVU1WbDNZbXQwY0ZSclZuQmpia0poVFZjNWFtSldiSEZaYTNob1UyeHNWV0pGUmtWWGJVWnZWakZLVUZkcWJGSmhXRVp1V2xkb1EyRnVRak5TUjNNd1lWWkpOVTVXVmxkV1ZUVnlUMGhLYjFsVlRYbGhiVGcwVjBkYWVGbHFWbFppYlhoeFpFWkZkMDU1Y3pCaFZsSkpWRVpPTm1WRk1IcGxWWFJ2VFVaR1ZtRXdWVFJSVnpsSFVsaEtVRTFZUmxCU01WcFJVMVJDTmxsV2FIcFdWWEJ0WTBSU2JFMVVRazlPVjNSU1ZucFdUMU5XWTNaU1ZYUkZVMGhzYlU5VmJGaGtNMUl3WTFWc1lXTlhSakJTYTA1RVlVWmtjbUo2VmtSU00wSllUREkxUmsxWVl6SmxWM1JKVlZoQk1sVXhTbEppU0Zwd1VrVXdNRlpFVWt0VU1rWnNVVmQwYzFSV1VrMVVWV055V1RCYVRHSXpaRTlUVm05NVlraE9SR1JzVG5aUmFrWmFaVmRPVGxOVlNteGFiRXB1Wld0U2RVMHhSVGxRVTBselNXMWtjMkl5U21oaVJYUnNaVlZzYTBscWIybFpiVkpzV2xSVk1rNVVXWGRaTWxwcFRrUk9hazlYU1hsUFIwcHRUMVJvYkZsWFRtaGFiVVV5VGtSWmFXWlJQVDBpZlE9PSJ9 |
6 changes: 6 additions & 0 deletions
6
pkg/tests/pull/cases/airgap/wantResults/base/charts/my-chart/Chart.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
apiVersion: v2 | ||
appVersion: 0.1.0 | ||
description: A Helm chart for Kubernetes | ||
name: my-chart | ||
type: application | ||
version: 0.1.0 |
8 changes: 8 additions & 0 deletions
8
pkg/tests/pull/cases/airgap/wantResults/base/charts/my-chart/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
apiVersion: kustomize.config.k8s.io/v1beta1 | ||
kind: Kustomization | ||
metadata: | ||
annotations: | ||
kots.io/kustomization: base | ||
resources: | ||
- templates/my-chart-configmap.yaml | ||
- templates/my-chart-pod.yaml |
6 changes: 6 additions & 0 deletions
6
...ests/pull/cases/airgap/wantResults/base/charts/my-chart/templates/my-chart-configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Source: my-chart/templates/my-chart-configmap.yaml | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: my-chart-configmap | ||
data: {} |
11 changes: 11 additions & 0 deletions
11
pkg/tests/pull/cases/airgap/wantResults/base/charts/my-chart/templates/my-chart-pod.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# Source: my-chart/templates/my-chart-pod.yaml | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: my-chart-pod | ||
spec: | ||
containers: | ||
- name: my-chart-container | ||
image: nginx:1.23 | ||
ports: | ||
- containerPort: 80 |
1 change: 1 addition & 0 deletions
1
pkg/tests/pull/cases/airgap/wantResults/base/charts/my-chart/values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{} |
6 changes: 6 additions & 0 deletions
6
pkg/tests/pull/cases/airgap/wantResults/base/charts/test-chart/Chart.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
apiVersion: v2 | ||
appVersion: 1.16.0 | ||
description: A Helm chart for Kubernetes | ||
name: test-chart | ||
type: application | ||
version: 0.1.0 |
Oops, something went wrong.