MGMT-1858 - subsystem should use dummy ignition image and not a real one #154
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| FROM registry.access.redhat.com/ubi8/ubi:latest | ||
|
|
||
| COPY build/dummy-ignition /dummy-ignition | ||
| COPY subsystem/test_kubeconfig /kubeconfig-noingress | ||
| CMD ["/dummy-ignition"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
|
|
||
| "github.com/kelseyhightower/envconfig" | ||
| "github.com/openshift/assisted-service/pkg/s3wrapper" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| var Options struct { | ||
| ClusterID string `envconfig:"CLUSTER_ID"` | ||
| S3Config s3wrapper.Config | ||
| } | ||
|
|
||
| var dummyFileMap map[string]string = map[string]string{ | ||
| "bootstrap.ign": "bootstrap file", | ||
| "master.ign": "master file", | ||
| "worker.ign": "worker file", | ||
| "kubeadmin-password": "kubeadmin-password file", | ||
| "kubeconfig-noingress": "kubeconfig-noingress file", | ||
| "metadata.json": "metadata file", | ||
| "install-config.yaml": "install-config file", | ||
| } | ||
|
|
||
| func createDummyFile(name, data string) error { | ||
| if name == "kubeconfig-noingress" { | ||
| return nil | ||
| } | ||
| f, err := os.Create(name) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = f.WriteString("data") | ||
| f.Close() | ||
| return err | ||
| } | ||
|
|
||
| func createDummyFiles() error { | ||
| for fileName, fileData := range dummyFileMap { | ||
| err := createDummyFile(fileName, fileData) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func uploadDummyFiles(s3Client *s3wrapper.S3Client, clusterID string) error { | ||
| ctx := context.Background() | ||
| for fileName := range dummyFileMap { | ||
| err := s3Client.UploadFile(ctx, fileName, clusterID+"/"+fileName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func main() { | ||
| log := logrus.New() | ||
| log.SetReportCaller(true) | ||
|
|
||
| log.Println("Starting dummy-ignition") | ||
|
|
||
| err := envconfig.Process("", &Options) | ||
| if err != nil { | ||
| log.Fatal(err.Error()) | ||
| } | ||
|
|
||
| log.Infof("S3 parameters: bucket %s, region %s", Options.S3Config.S3Bucket, Options.S3Config.Region) | ||
|
|
||
| s3Client := s3wrapper.NewS3Client(&Options.S3Config, log) | ||
| if s3Client == nil { | ||
| log.Fatal("failed to create S3 client, ", err) | ||
| } | ||
|
|
||
| err = createDummyFiles() | ||
| if err != nil { | ||
| log.Fatalf("Failed to create dummy files, err: %s", err) | ||
| } | ||
|
|
||
| err = uploadDummyFiles(s3Client, Options.ClusterID) | ||
| if err != nil { | ||
| log.Fatalf("Failed to upload dummy files, err: %s", err) | ||
| } | ||
|
|
||
| log.Println("Dummy ignition finished, Success") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,6 +64,7 @@ type Config struct { | |
| ServiceBaseURL string `envconfig:"SERVICE_BASE_URL"` | ||
| //[TODO] - change the default of Releae image to "", once everyine wll update their environment | ||
| ReleaseImage string `envconfig:"OPENSHIFT_INSTALL_RELEASE_IMAGE" default:"quay.io/openshift-release-dev/ocp-release@sha256:eab93b4591699a5a4ff50ad3517892653f04fb840127895bb3609b3cc68f98f3"` | ||
| SubsystemRun bool `envconfig:"SUBSYSTEM_RUN"` | ||
| } | ||
|
|
||
| func New(log logrus.FieldLogger, kube client.Client, cfg Config) *kubeJob { | ||
|
|
@@ -302,6 +303,10 @@ func (k *kubeJob) GenerateISO(ctx context.Context, cluster common.Cluster, jobNa | |
| func (k *kubeJob) createKubeconfigJob(cluster *common.Cluster, jobName string, cfg []byte, encodedDhcpFileContents string) *batch.Job { | ||
| id := cluster.ID | ||
| ignitionGeneratorImage := k.Config.IgnitionGenerator | ||
| var pullPolicy core.PullPolicy = "Always" | ||
| if k.Config.SubsystemRun { | ||
|
There was a problem hiding this comment. why not making the policy as a flag? There was a problem hiding this comment. Why not have the There was a problem hiding this comment. @ronniel1 always flag means that kuberenetes will try to pull the image from external repo every time, that's why we need to set never on subsystem There was a problem hiding this comment. but in this case there will not be an external repo |
||
| pullPolicy = "Never" | ||
| } | ||
| ret := &batch.Job{ | ||
| TypeMeta: meta.TypeMeta{ | ||
| Kind: "Job", | ||
|
|
@@ -323,7 +328,7 @@ func (k *kubeJob) createKubeconfigJob(cluster *common.Cluster, jobName string, c | |
| { | ||
| Name: ignitionGeneratorPrefix, | ||
| Image: ignitionGeneratorImage, | ||
| ImagePullPolicy: pullPolicy, | ||
| Env: []core.EnvVar{ | ||
| { | ||
| Name: "S3_ENDPOINT_URL", | ||
|
|
@@ -345,6 +350,10 @@ func (k *kubeJob) createKubeconfigJob(cluster *common.Cluster, jobName string, c | |
| Name: "S3_BUCKET", | ||
| Value: k.Config.S3Bucket, | ||
| }, | ||
| { | ||
| Name: "S3_REGION", | ||
| Value: k.Config.S3Region, | ||
| }, | ||
| { | ||
| Name: "CLUSTER_ID", | ||
| Value: id.String(), | ||
|
|
@@ -354,11 +363,11 @@ func (k *kubeJob) createKubeconfigJob(cluster *common.Cluster, jobName string, c | |
| Value: k.ReleaseImage, //TODO: change this to match the cluster openshift version | ||
| }, | ||
| { | ||
| Name: "AWS_ACCESS_KEY_ID", | ||
| Value: k.Config.AwsAccessKeyID, | ||
| }, | ||
| { | ||
| Name: "AWS_SECRET_ACCESS_KEY", | ||
| Value: k.Config.AwsSecretAccessKey, | ||
| }, | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
export DUMMY_IGNITION=minikube-local-registry/ignition-dummy-generator:minikube-test
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ronniel1 kubernetes will still treat it as external and will try to connect