airship/airshipctl
Code Issues Proposed changes

Remove deprecated fields of remoteDirect

Browse Source 
This change removes the deprecated "remoteType", "useProxy", and
"insecure" fields from the remoteDirect field of bootstrapInfo

Change-Id: I64d28b715b81464c871f99ad0348fadc2e9fc5f6
Relates-To: #242
This commit is contained in:
Ian Howell 2020-05-19 13:05:03 -05:00
parent fcb1202e11
commit 5a187e1810
4 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/clusterctl/cmd/testdata/airshipconfig.yaml vendored
View File

@ -11,7 +11,6 @@ bootstrapInfo:
outputMetadataFileName: output-metadata.yaml outputMetadataFileName: output-metadata.yaml
remoteDirect: remoteDirect:
isoUrl: http://localhost:8099/debian-custom.iso isoUrl: http://localhost:8099/debian-custom.iso
remoteType: redfish
clusters: clusters:
dummycluster: dummycluster:
clusterType: clusterType:

1
pkg/phase/apply/testdata/config.yaml vendored
View File

@ -11,7 +11,6 @@ bootstrapInfo:
outputMetadataFileName: output-metadata.yaml outputMetadataFileName: output-metadata.yaml
remoteDirect: remoteDirect:
isoUrl: http://localhost:8099/debian-custom.iso isoUrl: http://localhost:8099/debian-custom.iso
remoteType: redfish
clusters: clusters:
dummycluster: dummycluster:
clusterType: clusterType:

3
roles/airshipctl-test-configs/templates/airshipconfig.j2
View File

@ -6,9 +6,6 @@ bootstrapInfo:
image: {{ airship_config_iso_builder_docker_image }} image: {{ airship_config_iso_builder_docker_image }}
containerRuntime: docker containerRuntime: docker
remoteDirect: remoteDirect:
remoteType: {{ remote_type }}
insecure: {{ remote_insecure }}
useproxy: {{ remote_proxy }}
isoUrl: http://{{ airship_config_iso_serve_host }}:{{ airship_config_iso_port }}/{{ airship_config_iso_name }} isoUrl: http://{{ airship_config_iso_serve_host }}:{{ airship_config_iso_port }}/{{ airship_config_iso_name }}
builder: builder:
userDataFileName: user-data userDataFileName: user-data

1
testdata/k8s/config.yaml vendored
View File

@ -11,7 +11,6 @@ bootstrapInfo:
volume: /srv/iso:/config volume: /srv/iso:/config
remoteDirect: remoteDirect:
isoUrl: http://localhost:8099/debian-custom.iso isoUrl: http://localhost:8099/debian-custom.iso
remoteType: redfish
clusters: clusters:
default: default:
clusterType: clusterType: