From 9a81c4dea14a5354d19f94853efddf79d67ca4d2 Mon Sep 17 00:00:00 2001 From: Abhinav Dahiya Date: Fri, 5 Oct 2018 09:44:08 -0700 Subject: [PATCH] pkg/asset: update tectonic-operators to drop openshift apis https://github.com/coreos-inc/tectonic-operators/pull/464 merged changes that drop openshift-api. --- pkg/asset/ignition/bootstrap/bootstrap.go | 2 +- pkg/asset/ignition/content/tectonic.go | 2 +- ...ic-system-03-pull.go => tectonic-system-02-pull.go} | 2 +- ...ged-scc.go => tectonic-system-03-privileged-scc.go} | 0 pkg/asset/manifests/operators.go | 4 ++-- pkg/asset/manifests/tectonic.go | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) rename pkg/asset/manifests/content/tectonic/{tectonic-system-03-pull.go => tectonic-system-02-pull.go} (94%) rename pkg/asset/manifests/content/tectonic/{tectonic-system-02-privileged-scc.go => tectonic-system-03-privileged-scc.go} (100%) diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go index 8483d1ffded..fbd5bb5c8a1 100644 --- a/pkg/asset/ignition/bootstrap/bootstrap.go +++ b/pkg/asset/ignition/bootstrap/bootstrap.go @@ -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", diff --git a/pkg/asset/ignition/content/tectonic.go b/pkg/asset/ignition/content/tectonic.go index 635d2bc35cd..a37da6937a3 100644 --- a/pkg/asset/ignition/content/tectonic.go +++ b/pkg/asset/ignition/content/tectonic.go @@ -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" diff --git a/pkg/asset/manifests/content/tectonic/tectonic-system-03-pull.go b/pkg/asset/manifests/content/tectonic/tectonic-system-02-pull.go similarity index 94% rename from pkg/asset/manifests/content/tectonic/tectonic-system-03-pull.go rename to pkg/asset/manifests/content/tectonic/tectonic-system-02-pull.go index d3c2b139978..53c2973f855 100644 --- a/pkg/asset/manifests/content/tectonic/tectonic-system-03-pull.go +++ b/pkg/asset/manifests/content/tectonic/tectonic-system-02-pull.go @@ -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", diff --git a/pkg/asset/manifests/content/tectonic/tectonic-system-02-privileged-scc.go b/pkg/asset/manifests/content/tectonic/tectonic-system-03-privileged-scc.go similarity index 100% rename from pkg/asset/manifests/content/tectonic/tectonic-system-02-privileged-scc.go rename to pkg/asset/manifests/content/tectonic/tectonic-system-03-privileged-scc.go diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index c16832c1a4e..3c3358c29fd 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -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, }, } @@ -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, } diff --git a/pkg/asset/manifests/tectonic.go b/pkg/asset/manifests/tectonic.go index bbee48962b8..219a3c05424 100644 --- a/pkg/asset/manifests/tectonic.go +++ b/pkg/asset/manifests/tectonic.go @@ -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", } @@ -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))