Skip to content
This repository was archived by the owner on Oct 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
architect: giantswarm/architect@0.7.0
architect: giantswarm/architect@0.8.8

workflows:
workflow:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Replace custom `time.Time` wrapper `DeepCopyTime` with Kubernetes built-in `metav1.Time`.
- Update `architect-orb` to `v0.8.8`.

## [0.2.6] - 2020-04-15

Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.13
require (
github.com/go-openapi/errors v0.19.4
github.com/google/go-cmp v0.4.0
golang.org/x/tools v0.0.0-20200415034506-5d8e1897c761 // indirect
k8s.io/api v0.16.6
k8s.io/apiextensions-apiserver v0.16.6
k8s.io/apimachinery v0.16.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,7 @@ func withCondition(conditions []CommonClusterStatusCondition, condition CommonCl
}

newConditions = append(newConditions, condition)

for _, c := range conditions {
newConditions = append(newConditions, c)
}
newConditions = append(newConditions, conditions...)
}

// The new list is sorted to have the first item being the oldest. This is to
Expand Down Expand Up @@ -339,9 +336,7 @@ func withVersion(versions []CommonClusterStatusVersion, version CommonClusterSta

// Create a copy to not manipulate the input list.
var newVersions []CommonClusterStatusVersion
for _, v := range versions {
newVersions = append(newVersions, v)
}
newVersions = append(newVersions, versions...)

// Sort the versions in a way that the newest version, namely the one with the
// highest timestamp, is at the top of the list.
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/release/v1alpha1/release_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ spec:
type ReleaseState string

var (
stateActive ReleaseState = "active"
stateDeprecated ReleaseState = "deprecated"
stateWIP ReleaseState = "wip"
stateActive ReleaseState = "active" // nolint
stateDeprecated ReleaseState = "deprecated" // nolint
stateWIP ReleaseState = "wip" // nolint
releaseCRD *apiextensionsv1beta1.CustomResourceDefinition
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions scripts/gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ if [ ! -x "$(command -v goimports)" ]; then
fi
echo "Fixing imports in-place with goimports"
goimports -local github.com/giantswarm/apiextensions -w ./pkg

echo "Applying linter patch to generated files"
git apply "$dir/generated.patch"
13 changes: 13 additions & 0 deletions scripts/generated.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/pkg/clientset/versioned/fake/register.go b/pkg/clientset/versioned/fake/register.go
index ddabbb93..02da0520 100644
--- a/pkg/clientset/versioned/fake/register.go
+++ b/pkg/clientset/versioned/fake/register.go
@@ -36,7 +36,7 @@ import (

var scheme = runtime.NewScheme()
var codecs = serializer.NewCodecFactory(scheme)
-var parameterCodec = runtime.NewParameterCodec(scheme)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather replace that with var parameterCodec = runtime.NewParameterCodec(scheme) // nolint just in case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

+var parameterCodec = runtime.NewParameterCodec(scheme) // nolint
var localSchemeBuilder = runtime.SchemeBuilder{
applicationv1alpha1.AddToScheme,
backupv1alpha1.AddToScheme,