Skip to content

Commit d212fee

Browse files
jgwestjgwest
committed
Update to latest Go version
1 parent 94055a6 commit d212fee

10 files changed

+233
-209
lines changed

‎appstudio-controller/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ endif
172172
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
173173
.PHONY: controller-gen
174174
controller-gen: ## Download controller-gen locally if necessary.
175-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.1)
175+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
176176

177177
KUSTOMIZE = $(shell pwd)/bin/kustomize
178178
.PHONY: kustomize

‎backend-shared/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
99

1010
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
1111
controller-gen: ## Download controller-gen locally if necessary.
12-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.1)
12+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
1313

1414
KUSTOMIZE = $(shell pwd)/bin/kustomize
1515
kustomize: ## Download kustomize locally if necessary.

‎backend-shared/apis/managed-gitops/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend-shared/config/crd/bases/managed-gitops.redhat.com_gitopsdeploymentmanagedenvironments.yaml

+86-76
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.1
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: gitopsdeploymentmanagedenvironments.managed-gitops.redhat.com
88
spec:
99
group: managed-gitops.redhat.com
@@ -21,74 +21,83 @@ spec:
2121
API
2222
properties:
2323
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2729
type: string
2830
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3237
type: string
3338
metadata:
3439
type: object
3540
spec:
36-
description: The GitOpsDeploymentManagedEnvironment CR describes a remote
37-
cluster which the GitOps Service will deploy to, via Argo CD. This resource
38-
references a Secret resource, of type managed-gitops.redhat.com/managed-environment,
39-
that contains the cluster credentials. The Secret should contain credentials
40-
to a ServiceAccount/User account on the target cluster. This is referred
41-
to as the Argo CD 'ServiceAccount' below.
41+
description: |-
42+
The GitOpsDeploymentManagedEnvironment CR describes a remote cluster which the GitOps Service will deploy to, via Argo CD.
43+
This resource references a Secret resource, of type managed-gitops.redhat.com/managed-environment, that contains the cluster credentials.
44+
The Secret should contain credentials to a ServiceAccount/User account on the target cluster.
45+
This is referred to as the Argo CD 'ServiceAccount' below.
4246
properties:
4347
allowInsecureSkipTLSVerify:
44-
description: 'AllowInsecureSkipTLSVerify controls whether Argo CD
45-
will accept a Kubernetes API URL with untrusted-TLS certificate.
46-
Optional: If true, the GitOps Service will allow Argo CD to connect
47-
to the specified cluster even if it is using an invalid or self-signed
48-
TLS certificate. Defaults to false.'
48+
description: |-
49+
AllowInsecureSkipTLSVerify controls whether Argo CD will accept a Kubernetes API URL with untrusted-TLS certificate.
50+
Optional: If true, the GitOps Service will allow Argo CD to connect to the specified cluster even if it is using an invalid or self-signed TLS certificate.
51+
Defaults to false.
4952
type: boolean
5053
apiURL:
5154
description: APIURL is the URL of the cluster to connect to
5255
type: string
5356
clusterResources:
54-
description: "ClusterResources is used in conjuction with the Namespace
55-
field. If the .spec.namespaces field is non-empty, this field will
56-
be used to determine whether Argo CD should attempt to manage cluster-scoped
57-
resources. - If .spec.namespaces field is empty, this field is ignored.
58-
- If you are familiar with Argo CD: this field is equivalent to
59-
the field of the same name in the Argo CD Cluster Secret. \n Optional,
60-
default to false."
57+
description: |-
58+
ClusterResources is used in conjuction with the Namespace field.
59+
If the .spec.namespaces field is non-empty, this field will be used to determine whether Argo CD should
60+
attempt to manage cluster-scoped resources.
61+
- If .spec.namespaces field is empty, this field is ignored.
62+
- If you are familiar with Argo CD: this field is equivalent to the field of the same name in the Argo CD Cluster Secret.
63+
64+
65+
Optional, default to false.
6166
type: boolean
6267
createNewServiceAccount:
63-
description: "CreateNewServiceAccount controls whether Argo CD will
64-
use the ServiceAccount provided by the user in the Secret, or if
65-
a new ServiceAccount should be created. \n Optional, default to
66-
false. \n - If true, the GitOps Service will automatically create
67-
a ServiceAccount/ClusterRole/ClusterRoleBinding on the target cluster,
68-
using the credentials provided by the user in the secret. - Argo
69-
CD will then be configured to deploy with that new ServiceAccount.
70-
\n - Default: If false, it is assumed that the credentials provided
71-
by the user in the Secret are for a ServiceAccount on the cluster,
72-
and Argo CD will be configred to use the ServiceAccount referenced
73-
by the Secret of the user. No new ServiceAccount will be created.
74-
- This should be used, for example, when the ServiceAccount Argo
75-
CD does not have full cluster access (*/*/* at cluster scope)"
68+
description: |-
69+
CreateNewServiceAccount controls whether Argo CD will use the ServiceAccount provided by the user in the Secret, or if a new ServiceAccount
70+
should be created.
71+
72+
73+
Optional, default to false.
74+
75+
76+
- If true, the GitOps Service will automatically create a ServiceAccount/ClusterRole/ClusterRoleBinding on the target cluster,
77+
using the credentials provided by the user in the secret.
78+
- Argo CD will then be configured to deploy with that new ServiceAccount.
79+
80+
81+
- Default: If false, it is assumed that the credentials provided by the user in the Secret are for a ServiceAccount on the cluster, and
82+
Argo CD will be configred to use the ServiceAccount referenced by the Secret of the user. No new ServiceAccount will be created.
83+
- This should be used, for example, when the ServiceAccount Argo CD does not have full cluster access (*/*/* at cluster scope)
7684
type: boolean
7785
credentialsSecret:
7886
description: ClusterCredentialsSecret is a reference to a Secret that
7987
contains cluster connection details. The cluster details should
8088
be in the form of a kubeconfig file.
8189
type: string
8290
namespaces:
83-
description: "Namespaces allows one to indicate which Namespaces the
84-
Secret's ServiceAccount has access to. \n Optional, defaults to
85-
empty. If empty, it is assumed that the ServiceAccount has access
86-
to all Namespaces. \n The ServiceAccount that GitOps Service/Argo
87-
CD uses to deploy may not have access to all of the Namespaces on
88-
a cluster. If not specified, it is assumed that the Argo CD ServiceAccount
89-
has read/write at cluster-scope. - If you are familiar with Argo
90-
CD: this field is equivalent to the field of the same name in the
91-
Argo CD Cluster Secret."
91+
description: |-
92+
Namespaces allows one to indicate which Namespaces the Secret's ServiceAccount has access to.
93+
94+
95+
Optional, defaults to empty. If empty, it is assumed that the ServiceAccount has access to all Namespaces.
96+
97+
98+
The ServiceAccount that GitOps Service/Argo CD uses to deploy may not have access to all of the Namespaces on a cluster.
99+
If not specified, it is assumed that the Argo CD ServiceAccount has read/write at cluster-scope.
100+
- If you are familiar with Argo CD: this field is equivalent to the field of the same name in the Argo CD Cluster Secret.
92101
items:
93102
type: string
94103
type: array
@@ -104,42 +113,42 @@ spec:
104113
conditions:
105114
items:
106115
description: "Condition contains details for one aspect of the current
107-
state of this API Resource. --- This struct is intended for direct
108-
use as an array at the field path .status.conditions. For example,
109-
\n type FooStatus struct{ // Represents the observations of a
110-
foo's current state. // Known .status.conditions.type are: \"Available\",
111-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
112-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
113-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
114-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
116+
state of this API Resource.\n---\nThis struct is intended for
117+
direct use as an array at the field path .status.conditions. For
118+
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
119+
observations of a foo's current state.\n\t // Known .status.conditions.type
120+
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
121+
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
122+
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
123+
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
124+
\ // other fields\n\t}"
115125
properties:
116126
lastTransitionTime:
117-
description: lastTransitionTime is the last time the condition
118-
transitioned from one status to another. This should be when
119-
the underlying condition changed. If that is not known, then
120-
using the time when the API field changed is acceptable.
127+
description: |-
128+
lastTransitionTime is the last time the condition transitioned from one status to another.
129+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
121130
format: date-time
122131
type: string
123132
message:
124-
description: message is a human readable message indicating
125-
details about the transition. This may be an empty string.
133+
description: |-
134+
message is a human readable message indicating details about the transition.
135+
This may be an empty string.
126136
maxLength: 32768
127137
type: string
128138
observedGeneration:
129-
description: observedGeneration represents the .metadata.generation
130-
that the condition was set based upon. For instance, if .metadata.generation
131-
is currently 12, but the .status.conditions[x].observedGeneration
132-
is 9, the condition is out of date with respect to the current
133-
state of the instance.
139+
description: |-
140+
observedGeneration represents the .metadata.generation that the condition was set based upon.
141+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
142+
with respect to the current state of the instance.
134143
format: int64
135144
minimum: 0
136145
type: integer
137146
reason:
138-
description: reason contains a programmatic identifier indicating
139-
the reason for the condition's last transition. Producers
140-
of specific condition types may define expected values and
141-
meanings for this field, and whether the values are considered
142-
a guaranteed API. The value should be a CamelCase string.
147+
description: |-
148+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
149+
Producers of specific condition types may define expected values and meanings for this field,
150+
and whether the values are considered a guaranteed API.
151+
The value should be a CamelCase string.
143152
This field may not be empty.
144153
maxLength: 1024
145154
minLength: 1
@@ -153,11 +162,12 @@ spec:
153162
- Unknown
154163
type: string
155164
type:
156-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
157-
--- Many .condition.type values are consistent across resources
158-
like Available, but because arbitrary conditions can be useful
159-
(see .node.status.conditions), the ability to deconflict is
160-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
165+
description: |-
166+
type of condition in CamelCase or in foo.example.com/CamelCase.
167+
---
168+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
169+
useful (see .node.status.conditions), the ability to deconflict is important.
170+
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
161171
maxLength: 316
162172
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
163173
type: string

0 commit comments

Comments
 (0)