Skip to content
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
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ jobs:
- name: Download dependencies
run: go mod download

- name: Run go vet
run: go vet ./...

- name: Run go fmt check
run: |
if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
Expand Down
67 changes: 32 additions & 35 deletions api/annotation/annotations.gen.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// GENERATED FILE -- DO NOT EDIT

package annotation
Expand Down Expand Up @@ -27,7 +26,7 @@ type ResourceTypes int

const (
Unknown ResourceTypes = iota
Pod
Pod
)

func (r ResourceTypes) String() string {
Expand Down Expand Up @@ -60,14 +59,13 @@ type Instance struct {
}

var (

OrgApacheDubboRev = Instance {
Name: "dubbo.apache.org/rev",
Description: "Specifies a control plane revision to which a given proxy "+
"is connected. This annotation is added automatically, not "+
"set by a user. In contrary to the label "+
"dubbo.apache.org/rev, it represents the actual revision, "+
"not the requested revision.",
OrgApacheDubboRev = Instance{
Name: "dubbo.apache.org/rev",
Description: "Specifies a control plane revision to which a given proxy " +
"is connected. This annotation is added automatically, not " +
"set by a user. In contrary to the label " +
"dubbo.apache.org/rev, it represents the actual revision, " +
"not the requested revision.",
FeatureStatus: Alpha,
Hidden: false,
Deprecated: false,
Expand All @@ -76,10 +74,10 @@ var (
},
}

OrgApacheDubboInjectTemplates = Instance {
Name: "inject.dubbo.apache.org/templates",
Description: "The name of the inject template(s) to use, as a comma "+
"separate list.",
OrgApacheDubboInjectTemplates = Instance{
Name: "inject.dubbo.apache.org/templates",
Description: "The name of the inject template(s) to use, as a comma " +
"separate list.",
FeatureStatus: Alpha,
Hidden: false,
Deprecated: false,
Expand All @@ -88,10 +86,10 @@ var (
},
}

OrgApacheDubboProxyConfig = Instance {
Name: "proxy.dubbo.apache.org/config",
Description: "Overrides for the proxy configuration for this specific "+
"proxy.",
OrgApacheDubboProxyConfig = Instance{
Name: "proxy.dubbo.apache.org/config",
Description: "Overrides for the proxy configuration for this specific " +
"proxy.",
FeatureStatus: Beta,
Hidden: false,
Deprecated: false,
Expand All @@ -100,10 +98,10 @@ var (
},
}

OrgApacheDubboProxyOverrides = Instance {
Name: "proxy.dubbo.apache.org/overrides",
Description: "Used internally to indicate user-specified overrides in "+
"the proxy container of the pod during injection.",
OrgApacheDubboProxyOverrides = Instance{
Name: "proxy.dubbo.apache.org/overrides",
Description: "Used internally to indicate user-specified overrides in " +
"the proxy container of the pod during injection.",
FeatureStatus: Alpha,
Hidden: true,
Deprecated: false,
Expand All @@ -112,10 +110,10 @@ var (
},
}

OrgApacheDubboProxylessInject = Instance {
Name: "proxyless.dubbo.apache.org/inject",
Description: "Specifies whether or not an proxyless adapter should be "+
"automatically injected into the workload.",
OrgApacheDubboProxylessInject = Instance{
Name: "proxyless.dubbo.apache.org/inject",
Description: "Specifies whether or not an proxyless adapter should be " +
"automatically injected into the workload.",
FeatureStatus: Alpha,
Hidden: false,
Deprecated: true,
Expand All @@ -124,24 +122,23 @@ var (
},
}

OrgApacheDubboProxylessStatus = Instance {
Name: "proxyless.dubbo.apache.org/status",
Description: "Generated by proxyless adapter injection that indicates "+
"the status of the operation. Includes a version hash of "+
"the executed template, as well as names of injected "+
"resources.",
OrgApacheDubboProxylessStatus = Instance{
Name: "proxyless.dubbo.apache.org/status",
Description: "Generated by proxyless adapter injection that indicates " +
"the status of the operation. Includes a version hash of " +
"the executed template, as well as names of injected " +
"resources.",
FeatureStatus: Alpha,
Hidden: false,
Deprecated: false,
Resources: []ResourceTypes{
Pod,
},
}

)

func AllResourceAnnotations() []*Instance {
return []*Instance {
return []*Instance{
&OrgApacheDubboRev,
&OrgApacheDubboInjectTemplates,
&OrgApacheDubboProxyConfig,
Expand All @@ -152,7 +149,7 @@ func AllResourceAnnotations() []*Instance {
}

func AllResourceTypes() []string {
return []string {
return []string{
"Pod",
}
}
93 changes: 45 additions & 48 deletions api/label/labels.gen.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// GENERATED FILE -- DO NOT EDIT

package label
Expand Down Expand Up @@ -27,15 +26,15 @@ type ResourceTypes int

const (
Unknown ResourceTypes = iota
Any
Deployment
Gateway
HorizontalPodAutoscaler
Namespace
Pod
PodDisruptionBudget
Service
ServiceAccount
Any
Deployment
Gateway
HorizontalPodAutoscaler
Namespace
Pod
PodDisruptionBudget
Service
ServiceAccount
)

func (r ResourceTypes) String() string {
Expand Down Expand Up @@ -84,11 +83,10 @@ type Instance struct {
}

var (

OrgApacheDubboRev = Instance {
Name: "dubbo.apache.org/rev",
Description: "Dubbo control plane revision or tag associated with the "+
"resource; e.g. `canary`",
OrgApacheDubboRev = Instance{
Name: "dubbo.apache.org/rev",
Description: "Dubbo control plane revision or tag associated with the " +
"resource; e.g. `canary`",
FeatureStatus: Beta,
Hidden: false,
Deprecated: false,
Expand All @@ -99,13 +97,13 @@ var (
},
}

IoK8sNetworkingGatewayGatewayClassName = Instance {
Name: "gateway.networking.k8s.io/gateway-class-name",
Description: "Automatically added to all resources [automatically "+
"created](/docs/tasks/traffic-management/ingress/gateway-api/#automated-deployment) "+
"by Dubbo Gateway controller to indicate which "+
"`GatewayClass` resulted in the object creation. Users "+
"should not set this label themselves.",
IoK8sNetworkingGatewayGatewayClassName = Instance{
Name: "gateway.networking.k8s.io/gateway-class-name",
Description: "Automatically added to all resources [automatically " +
"created](/docs/tasks/traffic-management/ingress/gateway-api/#automated-deployment) " +
"by Dubbo Gateway controller to indicate which " +
"`GatewayClass` resulted in the object creation. Users " +
"should not set this label themselves.",
FeatureStatus: Stable,
Hidden: false,
Deprecated: false,
Expand All @@ -118,13 +116,13 @@ var (
},
}

IoK8sNetworkingGatewayGatewayName = Instance {
Name: "gateway.networking.k8s.io/gateway-name",
Description: "Automatically added to all resources [automatically "+
"created](/docs/tasks/traffic-management/ingress/gateway-api/#automated-deployment) "+
"by Dubbo Gateway controller to indicate which `Gateway` "+
"resulted in the object creation. Users should not set "+
"this label themselves.",
IoK8sNetworkingGatewayGatewayName = Instance{
Name: "gateway.networking.k8s.io/gateway-name",
Description: "Automatically added to all resources [automatically " +
"created](/docs/tasks/traffic-management/ingress/gateway-api/#automated-deployment) " +
"by Dubbo Gateway controller to indicate which `Gateway` " +
"resulted in the object creation. Users should not set " +
"this label themselves.",
FeatureStatus: Stable,
Hidden: false,
Deprecated: false,
Expand All @@ -137,10 +135,10 @@ var (
},
}

OrgApacheDubboOperatorComponent = Instance {
Name: "operator.dubbo.apache.org/component",
Description: "Dubbo operator component name of the resource, e.g. "+
"`Pilot`",
OrgApacheDubboOperatorComponent = Instance{
Name: "operator.dubbo.apache.org/component",
Description: "Dubbo operator component name of the resource, e.g. " +
"`Pilot`",
FeatureStatus: Alpha,
Hidden: true,
Deprecated: false,
Expand All @@ -149,10 +147,10 @@ var (
},
}

OrgApacheDubboOperatorManaged = Instance {
Name: "operator.dubbo.apache.org/managed",
Description: "Set to `Reconcile` if the Dubbo operator will reconcile "+
"the resource.",
OrgApacheDubboOperatorManaged = Instance{
Name: "operator.dubbo.apache.org/managed",
Description: "Set to `Reconcile` if the Dubbo operator will reconcile " +
"the resource.",
FeatureStatus: Alpha,
Hidden: true,
Deprecated: false,
Expand All @@ -161,10 +159,10 @@ var (
},
}

OrgApacheDubboOperatorVersion = Instance {
Name: "operator.dubbo.apache.org/version",
Description: "The Dubbo operator version that installed the resource, "+
"e.g. `1.6.0`",
OrgApacheDubboOperatorVersion = Instance{
Name: "operator.dubbo.apache.org/version",
Description: "The Dubbo operator version that installed the resource, " +
"e.g. `1.6.0`",
FeatureStatus: Alpha,
Hidden: true,
Deprecated: false,
Expand All @@ -173,22 +171,21 @@ var (
},
}

OrgApacheDubboProxylessInject = Instance {
Name: "proxyless.dubbo.apache.org/inject",
Description: "Specifies whether or not an proxyless adapter should be "+
"automatically injected into the workload.",
OrgApacheDubboProxylessInject = Instance{
Name: "proxyless.dubbo.apache.org/inject",
Description: "Specifies whether or not an proxyless adapter should be " +
"automatically injected into the workload.",
FeatureStatus: Alpha,
Hidden: false,
Deprecated: false,
Resources: []ResourceTypes{
Pod,
},
}

)

func AllResourceLabels() []*Instance {
return []*Instance {
return []*Instance{
&OrgApacheDubboRev,
&IoK8sNetworkingGatewayGatewayClassName,
&IoK8sNetworkingGatewayGatewayName,
Expand All @@ -200,7 +197,7 @@ func AllResourceLabels() []*Instance {
}

func AllResourceTypes() []string {
return []string {
return []string{
"Any",
"Deployment",
"Gateway",
Expand Down
3 changes: 1 addition & 2 deletions dubboctl/pkg/sdk/tpl/zz_filesystem_generated.go

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

2 changes: 1 addition & 1 deletion pkg/config/schema/gvk/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var (
Pod = config.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"}
MeshGlobalConfig = config.GroupVersionKind{Group: "", Version: "v1alpha1", Kind: "MeshGlobalConfig"}
PeerAuthentication = config.GroupVersionKind{Group: "security.dubbo.apache.org", Version: "v1", Kind: "PeerAuthentication"}
DestinationRule = config.GroupVersionKind{Group: "networking.dubbo.apache.org", Version: "v1alpha3", Kind: "DestinationRule"}
DestinationRule = config.GroupVersionKind{Group: "networking.dubbo.apache.org", Version: "v1alpha3", Kind: "DestinationRule"}
VirtualService = config.GroupVersionKind{Group: "networking.dubbo.apache.org", Version: "v1", Kind: "VirtualService"}
EndpointSlice = config.GroupVersionKind{Group: "discovery.k8s.io", Version: "v1", Kind: "EndpointSlice"}
Endpoints = config.GroupVersionKind{Group: "", Version: "v1", Kind: "Endpoints"}
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/schema/gvr/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (
ServiceAccount = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "serviceaccounts"}
MeshGlobalConfig = schema.GroupVersionResource{Group: "", Version: "v1alpha1", Resource: "meshglobalconfigs"}
PeerAuthentication = schema.GroupVersionResource{Group: "security.dubbo.apache.org", Version: "v1", Resource: "peerauthentications"}
DestinationRule = schema.GroupVersionResource{Group: "networking.dubbo.apache.org", Version: "v1alpha3", Resource: "destinationrules"}
DestinationRule = schema.GroupVersionResource{Group: "networking.dubbo.apache.org", Version: "v1alpha3", Resource: "destinationrules"}
VirtualService = schema.GroupVersionResource{Group: "networking.dubbo.apache.org", Version: "v1", Resource: "virtualservices"}
EndpointSlice = schema.GroupVersionResource{Group: "discovery.k8s.io", Version: "v1", Resource: "endpointslices"}
Endpoints = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "endpoints"}
Expand Down
Loading