Skip to content

yokecd-installer: use ArgoCD Helm Chart version 9.5.14 #262

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

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

yokecd-installer: use ArgoCD Helm Chart version 9.5.14 #262

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
3 changes: 2 additions & 1 deletion cmd/atc/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,8 @@ func Handler(params HandlerParams) http.Handler {
ResourceMatchers: flight.Spec.ResourceAccessMatchers,
},
ManagedBy: "atc.yoke",
}); err != nil {
},
); err != nil {
failReview(&review, metav1.Status{
Status: metav1.StatusFailure,
Reason: metav1.StatusReasonBadRequest,
Expand Down
9 changes: 6 additions & 3 deletions cmd/atc/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3558,7 +3558,8 @@ func TestValidationCycle(t *testing.T) {
)
require.NoError(t, err)

require.NoError(t,
require.NoError(
t,
client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{
Timeout: 30 * time.Second,
Interval: time.Second,
Expand Down Expand Up @@ -3667,7 +3668,8 @@ func TestIdentityWithError(t *testing.T) {
)
require.NoError(t, err)

require.NoError(t,
require.NoError(
t,
client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{
Timeout: 30 * time.Second,
Interval: time.Second,
Expand Down Expand Up @@ -3874,7 +3876,8 @@ func TestInvalidChecksum(t *testing.T) {
airway, err = client.AirwayIntf().Create(context.Background(), airway, metav1.CreateOptions{})
require.NoError(t, err)

require.NoError(t,
require.NoError(
t,
client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{
Timeout: 30 * time.Second,
Interval: time.Second,
Expand Down
Binary file removed cmd/yokecd-installer/argocd/argo-cd-9.5.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added cmd/yokecd-installer/argocd/argo-cd-9.5.17.tgz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions cmd/yokecd-installer/argocd/flight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/yokecd/yoke/pkg/helm"
)

//go:embed argo-cd-9.5.0.tgz
//go:embed argo-cd-9.5.17.tgz
var archive []byte

// RenderChart renders the chart downloaded from https://argoproj.github.io/argo-helm/argo-cd
// Producing version: 9.5.0
// Producing version: 9.5.17
func RenderChart(release, namespace string, values map[string]any) ([]*unstructured.Unstructured, error) {
chart, err := helm.LoadChartFromZippedArchive(archive)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion cmd/yokecd/internal/svr/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ func Run(ctx context.Context, cfg Config) (err error) {

const addr = ":3666"

logger.Info("debug config",
logger.Info(
"debug config",
"cacheFS", cfg.CacheFS,
"addr", addr,
)
Expand Down
4 changes: 2 additions & 2 deletions internal/atc/reconciler_airway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ func (atc atc) Reconcile(ctx context.Context, event ctrl.Event) (result ctrl.Res
}
statusSchema, ok := version.Schema.OpenAPIV3Schema.Properties["status"]
if !ok {
version.Schema.OpenAPIV3Schema.Properties["status"] = *(openapi.SchemaFor[struct {
version.Schema.OpenAPIV3Schema.Properties["status"] = *openapi.SchemaFor[struct {
Conditions flight.Conditions `json:"conditions,omitempty"`
}]())
}]()
} else {
if statusSchema.Type != "object" {
return ctrl.Result{}, fmt.Errorf("invalid airway: status must be an object but got type: %q", statusSchema.Type)
Expand Down