Revert "provisioner: remove deprecated fields"

This reverts commit aa4acf1. The change broke on several internal manifests which should be fixed first. Signed-off-by: Alexander Yastrebov <[email protected]>
zalando-incubator · Feb 1, 2024 · c335aeb · c335aeb
1 parent 8caf60e
commit c335aeb
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 5 deletions.
diff --git a/provisioner/clusterpy_test.go b/provisioner/clusterpy_test.go
@@ -47,11 +47,11 @@ post_apply:
 
 	deletionsContent2 = `
 pre_apply:
-- name: {{.Cluster.Alias}}-pre
+- name: {{.Alias}}-pre
   namespace: templated
   kind: deployment
 post_apply:
-- name: {{.Cluster.Alias}}-post
+- name: {{.Alias}}-post
   namespace: templated
   kind: deployment
 `

diff --git a/provisioner/template.go b/provisioner/template.go
@@ -49,6 +49,21 @@ type templateContext struct {
 }
 
 type templateData struct {
+	// From api.Cluster, TODO: drop after we migrate all Kubernetes manifests
+	Alias                 string
+	APIServerURL          string
+	Channel               string
+	ConfigItems           map[string]string
+	CriticalityLevel      int32
+	Environment           string
+	ID                    string
+	InfrastructureAccount string
+	LifecycleStatus       string
+	LocalID               string
+	NodePools             []*api.NodePool
+	Region                string
+	Owner                 string
+
 	// Available everywhere
 	Cluster *api.Cluster
 
@@ -57,6 +72,12 @@ type templateData struct {
 
 	// Available in node pool templates
 	NodePool *api.NodePool
+
+	// User data (deprecated, TODO: move to .Values.UserData)
+	UserData string
+
+	// Path to the generated files uploaded to S3 (deprecated, TODO: move to .Values.S3GeneratedFilesPath)
+	S3GeneratedFilesPath string
 }
 
 func newTemplateContext(fileData map[string][]byte, cluster *api.Cluster, nodePool *api.NodePool, values map[string]interface{}, adapter *awsAdapter) *templateContext {
@@ -137,9 +158,30 @@ func renderTemplate(context *templateContext, file string) (string, error) {
 	var out bytes.Buffer
 
 	data := &templateData{
-		Cluster:  context.cluster,
-		Values:   context.values,
-		NodePool: context.nodePool,
+		Alias:                 context.cluster.Alias,
+		APIServerURL:          context.cluster.APIServerURL,
+		Channel:               context.cluster.Channel,
+		ConfigItems:           context.cluster.ConfigItems,
+		CriticalityLevel:      context.cluster.CriticalityLevel,
+		Environment:           context.cluster.Environment,
+		ID:                    context.cluster.ID,
+		InfrastructureAccount: context.cluster.InfrastructureAccount,
+		LifecycleStatus:       context.cluster.LifecycleStatus,
+		LocalID:               context.cluster.LocalID,
+		NodePools:             context.cluster.NodePools,
+		Region:                context.cluster.Region,
+		Owner:                 context.cluster.Owner,
+		Cluster:               context.cluster,
+		Values:                context.values,
+		NodePool:              context.nodePool,
+	}
+
+	if ud, ok := context.values[userDataValuesKey]; ok {
+		data.UserData = ud.(string)
+	}
+
+	if s3path, ok := context.values[s3GeneratedFilesPathValuesKey]; ok {
+		data.S3GeneratedFilesPath = s3path.(string)
 	}
 
 	err = t.Execute(&out, data)