Skip to content

replace tectonicClusterID tag with openshiftClusterID #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 11, 2018
Merged

replace tectonicClusterID tag with openshiftClusterID #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ After deleting your cluster deployment you will see an uninstall job created. If
1. You can manually run the uninstall code with hiveutil to delete AWS resources based on their tags.
* Get your cluster UUID from the clusterdeployment.Spec.ClusterUUID.
* `make hiveutil`
* `bin/hiveutil aws-tag-deprovision --loglevel=debug --cluster-name CLUSTER_NAME tectonicClusterID=CLUSTER_UUID kubernetes.io/cluster/CLUSTER_NAME=owned`
* `bin/hiveutil aws-tag-deprovision --loglevel=debug --cluster-name CLUSTER_NAME openshiftClusterID=CLUSTER_UUID kubernetes.io/cluster/CLUSTER_NAME=owned`
2 changes: 1 addition & 1 deletion contrib/pkg/installmanager/installmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
// relative to our WorkDir.
metadataRelativePath = "metadata.json"
adminKubeConfigRelativePath = "auth/kubeconfig"
uuidKey = "tectonicClusterID"
uuidKey = "openshiftClusterID"
kubernetesKeyPrefix = "kubernetes.io/cluster/"
metadataConfigmapStringTemplate = "%s-metadata"
adminKubeConfigSecretStringTemplate = "%s-admin-kubeconfig"
Expand Down
2 changes: 1 addition & 1 deletion contrib/pkg/installmanager/installmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (
echo "Fake Installer"
echo $@
WORKDIR=%s
echo '{"clusterName":"test-cluster","aws":{"region":"us-east-1","identifier":{"tectonicClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}' > $WORKDIR/metadata.json
echo '{"clusterName":"test-cluster","aws":{"region":"us-east-1","identifier":{"openshiftClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}' > $WORKDIR/metadata.json
mkdir -p $WORKDIR/auth/
echo "fakekubeconfig" > $WORKDIR/auth/kubeconfig
`
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clusterdeployment/clusterdeployment_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func testMetadataConfigMap() *corev1.ConfigMap {
metadataJSON := `{
"aws": {
"identifier": {
"tectonicClusterID": "testFooClusterUUID"
"openshiftClusterID": "testFooClusterUUID"
}
}
}`
Expand Down
2 changes: 1 addition & 1 deletion pkg/install/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func GenerateUninstallerJob(
"debug",
"--cluster-name",
cd.Name,
fmt.Sprintf("tectonicClusterID=%s", cd.Spec.ClusterUUID),
fmt.Sprintf("openshiftClusterID=%s", cd.Spec.ClusterUUID),
fmt.Sprintf("kubernetes.io/cluster/%s=owned", cd.Spec.Config.ClusterID),
},
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/clusterdeployment/clusterdeployment_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var jobKey = types.NamespacedName{Name: "foo-install", Namespace: "default"}
const (
timeout = time.Second * 10
fakeClusterUUID = "fe953108-f64c-4166-bb8e-20da7665ba00"
fakeClusterMetadata = `{"clusterName":"foo","aws":{"region":"us-east-1","identifier":{"tectonicClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}`
fakeClusterMetadata = `{"clusterName":"foo","aws":{"region":"us-east-1","identifier":{"openshiftClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}`
)

func init() {
Expand Down