зеркало из https://github.com/Azure/orkestra.git
chore: Update docker targets in Make and comment cleanup (#34)
* Add PUML sequence diagrams Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Setup azure-pipeline for Go Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * chore: change branch name pattern to dev (#23) * Fix go.mod dependencies go.mod was failing to resolve dependencies Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Add additional tests for Argo.go functions Added more test and test cases Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Updated status field for application type Made Chartstatus inline so that we reference it under obj.status instead of obj.status.status which causes stutter Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Created registry Client and related methods - Modifications to rest of the code tree to support registry client Still a WIP Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * New configurer and additional controller members Added new members to Application and ApplicationGroup controller objects Refactored the controller Config struct Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * feat: Restructuring w/ major changes Bunch of changes to the controller and reconciler Updated configurer and config.yaml format Changes to application and applicationgroup CRD Status fields Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Update orkestra-core illustration (#30) * Add PUML sequence diagrams Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Setup azure-pipeline for Go Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Update diagram and switch harbor for chartmuseum Update the orkestra-core diagram replacing harbor for chartmuseum Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * feat: Implemented the Push functionlity Verfied manually that charts get uploaded to the staging directory Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * bug: resolve merge errors Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * feat: Modifications and enhanced argo logic - Multiple changes in argo object to support generation of valid workflow - Added overlays field to Applications CR as a workaround for https://github.com/kubernetes/kubernetes/issues/98683 - Helm chart for orkestra init. All dependency charts helm-operator, chartmuseum, argo added to chart dependencies. - Update main.go Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Fix lint and argo_test errors Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> * Docker target changes and TODO comment cleanup Signed-off-by: Nitish Malhotra <nitish.malhotra@gmail.com> Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com>
This commit is contained in:
Родитель
73a3f65786
Коммит
33c8204271
|
@ -12,6 +12,7 @@ RUN go mod download
|
|||
# Copy the go source
|
||||
COPY main.go main.go
|
||||
COPY api/ api/
|
||||
COPY pkg/ pkg/
|
||||
COPY controllers/ controllers/
|
||||
|
||||
# Build
|
||||
|
|
2
Makefile
2
Makefile
|
@ -1,6 +1,6 @@
|
|||
|
||||
# Image URL to use all building/pushing image targets
|
||||
IMG ?= controller:latest
|
||||
IMG ?= azureorkestra/orkestra:latest
|
||||
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
|
||||
CRD_OPTIONS ?= "crd:trivialVersions=true"
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ func NewConfigurer(cfgPath string) (*Configurer, error) {
|
|||
func setupRegistryRepos(registries map[string]*registry.Config) error {
|
||||
settings := cli.New()
|
||||
repoFile := settings.RepositoryConfig
|
||||
// TODO (nitishm) : Do we need to do this? https://github.com/helm/helm/blob/v3.1.2/cmd/helm/repo_add.go#L83-L109
|
||||
err := os.MkdirAll(filepath.Dir(repoFile), os.ModePerm)
|
||||
if err != nil && !os.IsExist(err) {
|
||||
return err
|
||||
|
|
|
@ -12,12 +12,11 @@ type Config struct {
|
|||
KeyFile string `yaml:"keyFile" json:"key_file,omitempty"`
|
||||
InsecureSkipVerify bool `yaml:"insecureSkipVerify" json:"insecure_skip_verify,omitempty"`
|
||||
|
||||
// TODO (nitishm) : Add these fields to the config.yaml as and when use case arrives
|
||||
// TODO (nitishm) : Add these fields to the config.yaml as and when the need arrives
|
||||
// See https://github.com/helm/helm/blob/v3.2.1/pkg/action/install.go#L106-L116
|
||||
// Keyring string // --keyring
|
||||
// Verify bool // --verify
|
||||
// Version string // --version
|
||||
|
||||
// XXX (nitishm) : Is this required? Since it is not part of the repoAddOption in the helm go package
|
||||
AccessToken string `yaml:"accessToken" json:"access_token,omitempty"`
|
||||
}
|
||||
|
|
|
@ -299,8 +299,7 @@ func generateSubchartAndAppDAGTasks(app *v1alpha1.Application, repo, targetNS st
|
|||
return nil, fmt.Errorf("repo arg must be a valid non-empty string")
|
||||
}
|
||||
|
||||
// XXX (nitishm)
|
||||
// Should this be set to nil if no subcharts are found??
|
||||
// XXX (nitishm) Should this be set to nil if no subcharts are found??
|
||||
tasks := make([]v1alpha12.DAGTask, 0, len(app.Spec.Subcharts)+1)
|
||||
|
||||
for _, sc := range app.Spec.Subcharts {
|
||||
|
|
Загрузка…
Ссылка в новой задаче