Skip to content

pkg/asset: update tectonic-operators to drop all openshift apis #421

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
Oct 8, 2018
Merged

pkg/asset: update tectonic-operators to drop all openshift apis #421

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 pkg/asset/ignition/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
CloudProvider: getCloudProvider(installConfig),
CloudProviderConfig: getCloudProviderConfig(installConfig),
DebugConfig: "",
KubeCoreRenderImage: "quay.io/coreos/kube-core-renderer-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85",
KubeCoreRenderImage: "quay.io/coreos/kube-core-renderer-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
EtcdCertSignerImage: "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6",
EtcdctlImage: "quay.io/coreos/etcd:v3.2.14",
BootkubeImage: "quay.io/coreos/bootkube:v0.10.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/ignition/content/tectonic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ wait_for_pods() {
# Wait for Kubernetes pods
wait_for_pods kube-system

for file in $(find . -type f -maxdepth 1)
for file in $(find . -maxdepth 1 -type f | sort)
do
echo "Creating object from file: $file ..."
kubectl create --filename "$file"
Expand Down
2 changes: 1 addition & 1 deletion ...ntent/tectonic/tectonic-system-03-pull.go → ...ntent/tectonic/tectonic-system-02-pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

var (
// PullTectonicSystem is the variable/constant representing the contents of the respective file
PullTectonicSystem = template.Must(template.New("tectonic-system-03-pull.json").Parse(`
PullTectonicSystem = template.Must(template.New("tectonic-system-02-pull.json").Parse(`
{
"apiVersion": "v1",
"kind": "Secret",
Expand Down
0 ...onic/tectonic-system-02-privileged-scc.go → ...onic/tectonic-system-03-privileged-scc.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (m *Manifests) Generate(dependencies asset.Parents) error {
Data: kubeSysConfigData,
},
{
Filename: filepath.Join("tectonic", "cluster-config.yaml"),
Filename: filepath.Join("tectonic", "00_cluster-config.yaml"),
Data: tectonicConfigData,
},
}
Expand Down Expand Up @@ -178,7 +178,7 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
ServiceaccountPub: base64.StdEncoding.EncodeToString(serviceAccountKeyPair.Public()),
ServiceServingCaCert: base64.StdEncoding.EncodeToString(serviceServingCA.Cert()),
ServiceServingCaKey: base64.StdEncoding.EncodeToString(serviceServingCA.Key()),
TectonicNetworkOperatorImage: "quay.io/coreos/tectonic-network-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85",
TectonicNetworkOperatorImage: "quay.io/coreos/tectonic-network-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
WorkerIgnConfig: base64.StdEncoding.EncodeToString(workerIgnition.Files()[0].Data),
CVOClusterID: installConfig.Config.ClusterID,
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/asset/manifests/tectonic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ func (t *Tectonic) Generate(dependencies asset.Parents) error {
IngressTLSBundle: base64.StdEncoding.EncodeToString(bytes.Join([][]byte{ingressCertKey.Cert(), ingressCertKey.Key()}, []byte{})),
IngressTLSCert: base64.StdEncoding.EncodeToString(ingressCertKey.Cert()),
IngressTLSKey: base64.StdEncoding.EncodeToString(ingressCertKey.Key()),
KubeAddonOperatorImage: "quay.io/coreos/kube-addon-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85",
KubeCoreOperatorImage: "quay.io/coreos/kube-core-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85",
KubeAddonOperatorImage: "quay.io/coreos/kube-addon-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
KubeCoreOperatorImage: "quay.io/coreos/kube-core-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
PullSecret: base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
TectonicIngressControllerOperatorImage: "quay.io/coreos/tectonic-ingress-controller-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85",
TectonicIngressControllerOperatorImage: "quay.io/coreos/tectonic-ingress-controller-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
TectonicVersion: "1.8.4-tectonic.2",
}

Expand All @@ -70,8 +70,8 @@ func (t *Tectonic) Generate(dependencies asset.Parents) error {
"99_tectonic-ingress-05-operator.yaml": applyTemplateData(content.TectonicIngressControllerOperator, templateData),
"99_tectonic-system-00-binding-admin.yaml": []byte(content.BindingAdmin),
"99_tectonic-system-01-ca-cert.yaml": applyTemplateData(content.CaCertTectonicSystem, templateData),
"99_tectonic-system-02-privileged-scc.yaml": []byte(content.PriviledgedSccTectonicSystem),
"99_tectonic-system-03-pull.json": applyTemplateData(content.PullTectonicSystem, templateData),
"99_tectonic-system-02-pull.json": applyTemplateData(content.PullTectonicSystem, templateData),
"99_tectonic-system-03-privileged-scc.yaml": []byte(content.PriviledgedSccTectonicSystem),
}

t.files = make([]*asset.File, 0, len(assetData))
Expand Down